fix(renderer): Update dead macro names (#12933) 09c54e8737 DISABLE_CLIP_RECT_FOR_VULKAN_MSAA was renamed to DISABLE_CLIP_DISTANCE_FOR_UBERSHADERS in #11040 (generalized from Vulkan-only to all MSAA ubershaders), which moved the #ifndef check sites to the new name. However, three #define sites were still on the old name. - draw_msaa_stencil.main - clear_clockwise_atomic_clip.main - init_clockwise_atomic_workaround.frag The latter two were added in #12120, five months after the rename, copy-pasting the already-dead define, so they had never once taken effect. Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
diff --git a/.rive_head b/.rive_head index 86c9fdb..4fe2840 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -adb0834474c0fbd7e84d07ae165e634988fc5c20 +09c54e8737317a5976777a4aea9afb65a44b4c60
diff --git a/renderer/src/shaders/spirv/clear_clockwise_atomic_clip.main b/renderer/src/shaders/spirv/clear_clockwise_atomic_clip.main index d3804f8..f9b5a5c 100644 --- a/renderer/src/shaders/spirv/clear_clockwise_atomic_clip.main +++ b/renderer/src/shaders/spirv/clear_clockwise_atomic_clip.main
@@ -6,7 +6,7 @@ // This shader doesn't need ENABLE_CLIP_RECT functionality. Disable it so that // it does not fail to compile on systems without ClipDistance support. -#define DISABLE_CLIP_RECT_FOR_VULKAN_MSAA +#define DISABLE_CLIP_DISTANCE_FOR_UBERSHADERS #include "glsl.minified.glsl" #include "constants.minified.glsl"
diff --git a/renderer/src/shaders/spirv/draw_msaa_stencil.main b/renderer/src/shaders/spirv/draw_msaa_stencil.main index 6a11916..50ce106 100644 --- a/renderer/src/shaders/spirv/draw_msaa_stencil.main +++ b/renderer/src/shaders/spirv/draw_msaa_stencil.main
@@ -6,7 +6,7 @@ // This shader doesn't need ENABLE_CLIP_RECT functionality. Disable it so that // it does not fail to compile on systems without ClipDistance support. -#define DISABLE_CLIP_RECT_FOR_VULKAN_MSAA +#define DISABLE_CLIP_DISTANCE_FOR_UBERSHADERS #include "glsl.minified.glsl" #include "constants.minified.glsl"
diff --git a/renderer/src/shaders/spirv/init_clockwise_atomic_workaround.frag b/renderer/src/shaders/spirv/init_clockwise_atomic_workaround.frag index 33769a8..fdf13ee 100644 --- a/renderer/src/shaders/spirv/init_clockwise_atomic_workaround.frag +++ b/renderer/src/shaders/spirv/init_clockwise_atomic_workaround.frag
@@ -3,7 +3,7 @@ #define RENDER_MODE_CLOCKWISE_ATOMIC // This shader doesn't need ENABLE_CLIP_RECT functionality. Disable it so that // it does not fail to compile on systems without ClipDistance support. -#define DISABLE_CLIP_RECT_FOR_VULKAN_MSAA +#define DISABLE_CLIP_DISTANCE_FOR_UBERSHADERS #include "glsl.minified.glsl" #include "constants.minified.glsl" #include "common.minified.glsl"