Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2022-04-13 08:38:52 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2022-04-13 16:51:51 +0300
commit9c09e5ba242fffc4906d86ce111def89e481c048 (patch)
tree2f2b9bbfd908a920097a2a48fd5d30a745e0a4a7 /source/blender/draw/intern
parente22fd7247adc4ce6de5eb7b4275b91116177109a (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/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_subdivision.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
index 2653035a39f..e0ec0e64ea2 100644
--- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc
+++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
@@ -1162,8 +1162,8 @@ static void draw_subdiv_ubo_update_and_bind(const DRWSubdivCache *cache,
GPU_uniformbuf_update(cache->ubo, &storage);
- const int location = GPU_shader_get_uniform_block(shader, "shader_data");
- GPU_uniformbuf_bind(cache->ubo, location);
+ const int binding = GPU_shader_get_uniform_block_binding(shader, "shader_data");
+ GPU_uniformbuf_bind(cache->ubo, binding);
}
/** \} */