archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

LShaderInterface: Fix interface binding with UBO containing arrays

Browse Source 
To avoid the issue we search using the name in the `name_buffer_` which
already have the array suffix stripped out.
This commit is contained in:
Clément Foucault
2022-01-24 21:25:48 +01:00
parent 5a0c5912a4
commit 4d799db72f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/opengl/gl_shader_interface.cc
View File

@@ -385,7 +385,7 @@ GLShaderInterface::GLShaderInterface(GLuint program, const shader::ShaderCreateI
if (res.bind_type == ShaderCreateInfo::Resource::BindType::UNIFORM_BUFFER) {
copy_input_name(input, res.uniformbuf.name, name_buffer_, name_buffer_offset);
if (true || !GLContext::explicit_location_support) {
input->location = glGetUniformBlockIndex(program, res.uniformbuf.name.c_str());
input->location = glGetUniformBlockIndex(program, name_buffer_ + input->name_offset);
glUniformBlockBinding(program, input->location, res.slot);
}
input->binding = res.slot;
@@ -424,7 +424,7 @@ GLShaderInterface::GLShaderInterface(GLuint program, const shader::ShaderCreateI
copy_input_name(input, uni.name, name_buffer_, name_buffer_offset);
/* Until we make use of explicit uniform location. */
if (true || !GLContext::explicit_location_support) {
input->location = glGetUniformLocation(program, uni.name.c_str());
input->location = glGetUniformLocation(program, name_buffer_ + input->name_offset);
}
input->binding = -1;
input++;