mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-12-24 09:20:58 +01:00
Merge pull request #919 from lioncash/sign
gl_shader_manager: Amend sign differences in an assertion comparison in SetShaderUniformBlockBinding()
This commit is contained in:
commit
13d6593753
1 changed files with 9 additions and 8 deletions
|
@ -13,15 +13,16 @@ 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) {
|
||||||
|
|
Loading…
Reference in a new issue