From 50089bf9969edb5f10ff552b90620a4882e3c474 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Feb 2021 13:38:38 +0000 Subject: m4 based GLSL embedding Passes a lint check, less mangling, more automation --- gfx/gl/shader-source.h | 20 ++++++++++++++++++++ gfx/gl/shader.cpp | 34 ++++++++++++++-------------------- gfx/gl/shader.h | 6 +++--- 3 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 gfx/gl/shader-source.h (limited to 'gfx') diff --git a/gfx/gl/shader-source.h b/gfx/gl/shader-source.h new file mode 100644 index 0000000..4fbbe5b --- /dev/null +++ b/gfx/gl/shader-source.h @@ -0,0 +1,20 @@ +#ifndef SHADER_SOURCE_H +#define SHADER_SOURCE_H + +#include + +struct GLsource { + const GLchar * text; + GLint len; + GLuint type; +}; + +constexpr auto +constexpr_strlen(const GLchar * const s) +{ + auto e {s}; + while (*++e) { } + return e - s; +} + +#endif diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index f80ab22..badaaef 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -10,11 +10,10 @@ #include #include -Shader::ProgramHandle::ProgramHandle(std::initializer_list srcs) : viewProjection_uniform {}, model_uniform {} +Shader::ProgramHandle::ProgramHandle(GLuint vs, GLuint fs) : viewProjection_uniform {}, model_uniform {} { - for (const auto & srcId : srcs) { - glAttachShader(m_program, srcId); - } + glAttachShader(m_program, vs); + glAttachShader(m_program, fs); glBindAttribLocation(m_program, 0, "position"); glBindAttribLocation(m_program, 1, "texCoord"); @@ -31,17 +30,17 @@ Shader::ProgramHandle::ProgramHandle(std::initializer_list srcs) : viewP } Shader::Shader() : - programs {{ProgramHandle { - Source {{basicShader_vs, basicShader_vs_len}, GL_VERTEX_SHADER}.id, - Source {{basicShader_fs, basicShader_fs_len}, GL_FRAGMENT_SHADER}.id, + programs {{{ + Source {basicShader_vs}.id, + Source {basicShader_fs}.id, }, - ProgramHandle { - Source {{waterShader_vs, waterShader_vs_len}, GL_VERTEX_SHADER}.id, - Source {{waterShader_fs, waterShader_fs_len}, GL_FRAGMENT_SHADER}.id, + { + Source {waterShader_vs}.id, + Source {waterShader_fs}.id, }, - ProgramHandle { - Source {{landmassShader_vs, landmassShader_vs_len}, GL_VERTEX_SHADER}.id, - Source {{landmassShader_fs, landmassShader_fs_len}, GL_FRAGMENT_SHADER}.id, + { + Source {landmassShader_vs}.id, + Source {landmassShader_fs}.id, }}} { } @@ -99,14 +98,9 @@ Shader::CheckShaderError(GLuint shader, GLuint flag, bool isProgram, std::string } } -Shader::Source::Source(const std::basic_string_view text, GLuint type) : - Source {(const GLchar *)(text.data()), (GLint)(text.length()), type} -{ -} - -Shader::Source::Source(const GLchar * text, GLint len, unsigned int type) : id {type} +Shader::Source::Source(const GLsource src) : id {src.type} { - glShaderSource(id, 1, &text, &len); + glShaderSource(id, 1, &src.text, &src.len); glCompileShader(id); CheckShaderError(id, GL_COMPILE_STATUS, false, "Error compiling shader!"); diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h index 47a2b7d..293ce9b 100644 --- a/gfx/gl/shader.h +++ b/gfx/gl/shader.h @@ -1,6 +1,7 @@ #ifndef SHADER_INCLUDED_H #define SHADER_INCLUDED_H +#include "shader-source.h" #include #include #include @@ -22,8 +23,7 @@ private: public: using ShaderRef = glRef; - Source(const std::basic_string_view text, GLuint type); - Source(const GLchar * text, GLint len, GLuint type); + explicit Source(const GLsource src); ShaderRef id; }; @@ -32,7 +32,7 @@ private: class ProgramHandle { public: - explicit ProgramHandle(std::initializer_list); + ProgramHandle(GLuint, GLuint); using ProgramRef = glRef; ProgramRef m_program; -- cgit v1.2.3