diff options
Diffstat (limited to 'gfx/gl')
| -rw-r--r-- | gfx/gl/shader.cpp | 6 | ||||
| -rw-r--r-- | gfx/gl/shader.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index 454ad4b..f80ab22 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -31,15 +31,15 @@ Shader::ProgramHandle::ProgramHandle(std::initializer_list<GLuint> srcs) : viewP }
Shader::Shader() :
- programs {{{
+ programs {{ProgramHandle {
Source {{basicShader_vs, basicShader_vs_len}, GL_VERTEX_SHADER}.id,
Source {{basicShader_fs, basicShader_fs_len}, GL_FRAGMENT_SHADER}.id,
},
- {
+ ProgramHandle {
Source {{waterShader_vs, waterShader_vs_len}, GL_VERTEX_SHADER}.id,
Source {{waterShader_fs, waterShader_fs_len}, GL_FRAGMENT_SHADER}.id,
},
- {
+ ProgramHandle {
Source {{landmassShader_vs, landmassShader_vs_len}, GL_VERTEX_SHADER}.id,
Source {{landmassShader_fs, landmassShader_fs_len}, GL_FRAGMENT_SHADER}.id,
}}}
diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h index 5d26781..47a2b7d 100644 --- a/gfx/gl/shader.h +++ b/gfx/gl/shader.h @@ -32,7 +32,7 @@ private: class ProgramHandle {
public:
- ProgramHandle(std::initializer_list<GLuint>);
+ explicit ProgramHandle(std::initializer_list<GLuint>);
using ProgramRef = glRef<GLuint, __glewCreateProgram, __glewDeleteProgram>;
ProgramRef m_program;
|