From b1c4d4e55b6e6dc7396ae297c4d3efce7ad1e973 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Tue, 14 Nov 2023 23:57:01 +1100 Subject: [PATCH] Ensure optional variants are loaded last. --- servers/rendering/renderer_rd/effects/copy_effects.cpp | 2 +- servers/rendering/renderer_rd/effects/copy_effects.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/rendering/renderer_rd/effects/copy_effects.cpp b/servers/rendering/renderer_rd/effects/copy_effects.cpp index aa1a87cdd7af..87033cb559fc 100644 --- a/servers/rendering/renderer_rd/effects/copy_effects.cpp +++ b/servers/rendering/renderer_rd/effects/copy_effects.cpp @@ -104,9 +104,9 @@ CopyEffects::CopyEffects(bool p_prefer_raster_effects) { copy_modes.push_back("\n"); // COPY_TO_FB_COPY copy_modes.push_back("\n#define MODE_PANORAMA_TO_DP\n"); // COPY_TO_FB_COPY_PANORAMA_TO_DP copy_modes.push_back("\n#define MODE_TWO_SOURCES\n"); // COPY_TO_FB_COPY2 + copy_modes.push_back("\n#define MODE_SET_COLOR\n"); // COPY_TO_FB_SET_COLOR copy_modes.push_back("\n#define MULTIVIEW\n"); // COPY_TO_FB_MULTIVIEW copy_modes.push_back("\n#define MULTIVIEW\n#define MODE_TWO_SOURCES\n"); // COPY_TO_FB_MULTIVIEW_WITH_DEPTH - copy_modes.push_back("\n#define MODE_SET_COLOR\n"); // COPY_TO_FB_SET_COLOR copy_to_fb.shader.initialize(copy_modes); diff --git a/servers/rendering/renderer_rd/effects/copy_effects.h b/servers/rendering/renderer_rd/effects/copy_effects.h index 470ac1acee2c..0fa4fe151881 100644 --- a/servers/rendering/renderer_rd/effects/copy_effects.h +++ b/servers/rendering/renderer_rd/effects/copy_effects.h @@ -172,11 +172,13 @@ class CopyEffects { COPY_TO_FB_COPY, COPY_TO_FB_COPY_PANORAMA_TO_DP, COPY_TO_FB_COPY2, + COPY_TO_FB_SET_COLOR, + // These variants are disabled unless XR shaders are enabled. + // They should be listed last. COPY_TO_FB_MULTIVIEW, COPY_TO_FB_MULTIVIEW_WITH_DEPTH, - COPY_TO_FB_SET_COLOR, COPY_TO_FB_MAX, };