Merge pull request #6452 from lioncash/shader

OGLShader: Fix mismatched assignment in compute shader constructor
dolphin-emu · Mar 17, 2018 · 56fd7bd · 56fd7bd
2 parents 917f0e2 + 882d1c1
commit 56fd7bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -31,8 +31,8 @@ class OGLShader final : public AbstractShader
 
 private:
   GLenum m_type;
-  GLuint m_id;
-  GLuint m_compute_program_id;
+  GLuint m_id = 0;
+  GLuint m_compute_program_id = 0;
 };
 
 }  // namespace OGL