ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6452 from lioncash/shader 

OGLShader: Fix mismatched assignment in compute shader constructor
This commit is contained in:
Stenzek 2018-03-17 12:42:36 +10:00 committed by GitHub
parent 917f0e2182 882d1c1256
commit 56fd7bded4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoBackends/OGL/OGLShader.cpp
View File

@ -30,7 +30,8 @@ OGLShader::OGLShader(ShaderStage stage, GLenum gl_type, GLuint shader_id)
} }
OGLShader::OGLShader(GLuint compute_program_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)
{ {
} }

4
Source/Core/VideoBackends/OGL/OGLShader.h
View File

@ -31,8 +31,8 @@ public:
private: private:
GLenum m_type; GLenum m_type;
GLuint m_id; GLuint m_id = 0;
GLuint m_compute_program_id; GLuint m_compute_program_id = 0;
}; };
} // namespace OGL } // namespace OGL