franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #919 from lioncash/sign 

gl_shader_manager: Amend sign differences in an assertion comparison in SetShaderUniformBlockBinding()
This commit is contained in:
bunnei 2018-08-04 14:29:59 -04:00 committed by GitHub
parent 762fcaf5de 3b678b9e8e
commit 13d6593753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/renderer_opengl/gl_shader_manager.cpp
View File

@ -13,16 +13,17 @@ namespace Impl {
static void SetShaderUniformBlockBinding(GLuint shader, const char* name, static void SetShaderUniformBlockBinding(GLuint shader, const char* name,
Maxwell3D::Regs::ShaderStage binding, Maxwell3D::Regs::ShaderStage binding,
size_t expected_size) { size_t expected_size) {
GLuint ub_index = glGetUniformBlockIndex(shader, name); const GLuint ub_index = glGetUniformBlockIndex(shader, name);
if (ub_index != GL_INVALID_INDEX) { if (ub_index == GL_INVALID_INDEX) {
return;
}
GLint ub_size = 0; GLint ub_size = 0;
glGetActiveUniformBlockiv(shader, ub_index, GL_UNIFORM_BLOCK_DATA_SIZE, &ub_size); glGetActiveUniformBlockiv(shader, ub_index, GL_UNIFORM_BLOCK_DATA_SIZE, &ub_size);
ASSERT_MSG(ub_size == expected_size, ASSERT_MSG(static_cast<size_t>(ub_size) == expected_size,
"Uniform block size did not match! Got {}, expected {}", "Uniform block size did not match! Got {}, expected {}", ub_size, expected_size);
static_cast<int>(ub_size), expected_size);
glUniformBlockBinding(shader, ub_index, static_cast<GLuint>(binding)); glUniformBlockBinding(shader, ub_index, static_cast<GLuint>(binding));
} }
}
void SetShaderUniformBlockBindings(GLuint shader) { void SetShaderUniformBlockBindings(GLuint shader) {
SetShaderUniformBlockBinding(shader, "vs_config", Maxwell3D::Regs::ShaderStage::Vertex, SetShaderUniformBlockBinding(shader, "vs_config", Maxwell3D::Regs::ShaderStage::Vertex,