diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-23 01:42:15 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-23 01:42:15 +0000 |
commit | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (patch) | |
tree | a697de87564846e784fd1256d71c94270d8ec51d /yage/core/glslprogram.h | |
parent | 278757a11e50e94e234f339d9d072a0d837dcb06 (diff) | |
parent | ddd26ed83d3ac0335562f762ced273a1d62bd959 (diff) | |
download | YAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.tar.gz YAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.zip |
Merge branch 'develop'v0.1.3
Diffstat (limited to 'yage/core/glslprogram.h')
-rw-r--r-- | yage/core/glslprogram.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/yage/core/glslprogram.h b/yage/core/glslprogram.h index 9e49d329..0617bc1e 100644 --- a/yage/core/glslprogram.h +++ b/yage/core/glslprogram.h @@ -19,9 +19,9 @@ namespace yage class GlslProgram { public: - GlslProgram() = default; + GlslProgram() = default; GlslProgram(const GlslProgram &) = delete; - GlslProgram(GlslProgram &&) = delete; + GlslProgram(GlslProgram &&) = delete; ~GlslProgram(); GlslProgram &operator=(const GlslProgram &) = delete; @@ -42,10 +42,10 @@ public: private: /// compiled shader program id - GLuint program_id_ = 0; - GLuint vertex_shader_id_ = 0; + GLuint program_id_ = 0; + GLuint vertex_shader_id_ = 0; GLuint fragment_shader_id_ = 0; - int attribute_index_ = 0; + int attribute_index_ = 0; /// compiles one shader void compileShader(GLuint shader, const std::string &shaderContent); |