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:
authorClément Foucault <foucault.clem@gmail.com>2022-01-26 21:08:56 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-01-26 21:09:05 +0300
commit57dfec79f4ab1ceeb8c5f6049aa03e779e7871c0 (patch)
treeb400a9a7e8d63dc2e60c45e988e969798c066d3b /source/blender/gpu
parent13f2df3c2806a187682ddd05d8ce44d56a42239e (diff)
DRW: Fix builtin uniform name mismatch
This lead to severe unreported regression, like volume rendering broken in workbench.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_shader_interface.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_shader_interface.hh b/source/blender/gpu/intern/gpu_shader_interface.hh
index 44dadec7b84..8c6d6ede11b 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.hh
+++ b/source/blender/gpu/intern/gpu_shader_interface.hh
@@ -191,9 +191,9 @@ inline const char *ShaderInterface::builtin_uniform_name(GPUUniformBuiltin u)
case GPU_UNIFORM_BASE_INSTANCE:
return "gpu_BaseInstance";
case GPU_UNIFORM_RESOURCE_CHUNK:
- return "resourceChunk";
+ return "drw_resourceChunk";
case GPU_UNIFORM_RESOURCE_ID:
- return "resourceId";
+ return "drw_ResourceID";
case GPU_UNIFORM_SRGB_TRANSFORM:
return "srgbTarget";