diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2022-04-13 08:38:52 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2022-04-13 16:51:51 +0300 |
| commit | 9c09e5ba242fffc4906d86ce111def89e481c048 (patch) | |
| tree | 2f2b9bbfd908a920097a2a48fd5d30a745e0a4a7 /source/blender/editors/interface/interface_icons.c | |
| parent | e22fd7247adc4ce6de5eb7b4275b91116177109a (diff) | |
Fix some usages of 'GPU_shader_get_uniform_block'
`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
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index e3bf1a48907..332b9b44b0a 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1584,10 +1584,10 @@ static void icon_draw_cache_texture_flush_ex(GPUTexture *texture, GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR); GPU_shader_bind(shader); - const int data_loc = GPU_shader_get_uniform_block(shader, "multi_rect_data"); + const int data_binding = GPU_shader_get_uniform_block_binding(shader, "multi_rect_data"); GPUUniformBuf *ubo = GPU_uniformbuf_create_ex( sizeof(struct MultiRectCallData), texture_draw_calls->drawcall_cache, __func__); - GPU_uniformbuf_bind(ubo, data_loc); + GPU_uniformbuf_bind(ubo, data_binding); const int img_binding = GPU_shader_get_texture_binding(shader, "image"); GPU_texture_bind_ex(texture, GPU_SAMPLER_ICON, img_binding, false); |