Merge pull request #6452 from lioncash/shader

OGLShader: Fix mismatched assignment in compute shader constructor
This commit is contained in:
Stenzek authored and GitHub committed 2018-03-17 12:42:36 +10:00
commit 56fd7bded4
2 files changed
+4 -3

No files matched your search

+2 -1
View File
@@ -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)
{
}
+2 -2
View File
@@ -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