diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2018-03-17 12:42:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-17 12:42:36 +1000 |
| commit | 56fd7bded4e5b57dbd347fce710008a922320bba (patch) | |
| tree | 7f1fc6682da8bce5f5972233420231fb673c46ab /Source/Core/VideoBackends | |
| parent | 917f0e2182dd9cd82c47dfdf32e2eee4bf28cb37 (diff) | |
| parent | 882d1c1256e7f8fa9d0414522b4dd776c0c9e652 (diff) | |
Merge pull request #6452 from lioncash/shader
OGLShader: Fix mismatched assignment in compute shader constructor
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLShader.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLShader.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/OGLShader.cpp b/Source/Core/VideoBackends/OGL/OGLShader.cpp index 62c17752f8..e881269524 100644 --- a/Source/Core/VideoBackends/OGL/OGLShader.cpp +++ b/Source/Core/VideoBackends/OGL/OGLShader.cpp @@ -30,7 +30,8 @@ OGLShader::OGLShader(ShaderStage stage, GLenum gl_type, GLuint shader_id) } OGLShader::OGLShader(GLuint compute_program_id) - : AbstractShader(ShaderStage::Compute), m_type(GL_COMPUTE_SHADER), m_id(compute_program_id) + : AbstractShader(ShaderStage::Compute), m_type(GL_COMPUTE_SHADER), + m_compute_program_id(compute_program_id) { } diff --git a/Source/Core/VideoBackends/OGL/OGLShader.h b/Source/Core/VideoBackends/OGL/OGLShader.h index 981c835cc1..e3036044f6 100644 --- a/Source/Core/VideoBackends/OGL/OGLShader.h +++ b/Source/Core/VideoBackends/OGL/OGLShader.h @@ -31,8 +31,8 @@ public: private: GLenum m_type; - GLuint m_id; - GLuint m_compute_program_id; + GLuint m_id = 0; + GLuint m_compute_program_id = 0; }; } // namespace OGL |