From 57dfec79f4ab1ceeb8c5f6049aa03e779e7871c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 26 Jan 2022 19:08:56 +0100 Subject: DRW: Fix builtin uniform name mismatch This lead to severe unreported regression, like volume rendering broken in workbench. --- source/blender/draw/intern/shaders/common_view_lib.glsl | 4 ++-- source/blender/gpu/intern/gpu_shader_interface.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 8627aa40bfd..d4d18b95238 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -106,8 +106,8 @@ uniform int drw_resourceChunk; # if defined(UNIFORM_RESOURCE_ID) /* This is in the case we want to do a special instance drawcall for one object but still want to * have the right resourceId and all the correct ubo datas. */ -uniform int drw_resourceId; -# define resource_id drw_resourceId +uniform int drw_ResourceID; +# define resource_id drw_ResourceID # else # define resource_id (gpu_BaseInstance + instanceId) # endif 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"; -- cgit v1.2.3