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

Fix some usages of 'GPU_shader_get_uniform_block'

Browse Source 
`GPU_shader_get_uniform_block` is marked as deprecated and the value
returned does not match what `GPU_uniformbuf_bind` expects.

Also, small typo fix in python error message.

Differential Revision: https://developer.blender.org/D14638
This commit is contained in:
Germano Cavalcante
2022-04-13 02:38:52 -03:00
parent e22fd7247a
commit 9c09e5ba24
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/python/gpu/gpu_py_shader.c
View File

@@ -537,16 +537,15 @@ static PyObject *pygpu_shader_uniform_block(BPyGPUShader *self, PyObject *args)
return NULL;
}
int slot = GPU_shader_get_uniform_block(self->shader, name);
if (slot == -1) {
int binding = GPU_shader_get_uniform_block_binding(self->shader, name);
if (binding == -1) {
PyErr_SetString(
PyExc_BufferError,
"GPUShader.uniform_buffer: uniform block not found, make sure the name is correct");
"GPUShader.uniform_block: uniform block not found, make sure the name is correct");
return NULL;
}
GPU_uniformbuf_bind(py_ubo->ubo, slot);
GPU_shader_uniform_1i(self->shader, name, slot);
GPU_uniformbuf_bind(py_ubo->ubo, binding);
Py_RETURN_NONE;
}