Prechádzať zdrojové kódy

Merge pull request #100125 from alessand10/uniform-variable-fix

Move uniform variables up in the `gles3/scene.glsl` template so that they are available within the `#GLOBALS` scope
Rémi Verschelde 9 mesiacov pred
rodič
commit
736dcf72cc
1 zmenil súbory, kde vykonal 4 pridanie a 3 odobranie
  1. 4 3
      drivers/gles3/shaders/scene.glsl

+ 4 - 3
drivers/gles3/shaders/scene.glsl

@@ -986,6 +986,10 @@ layout(std140) uniform MultiviewData { // ubo:8
 multiview_data;
 #endif
 
+uniform highp mat4 world_transform;
+uniform highp uint instance_offset;
+uniform highp uint model_flags;
+
 /* clang-format off */
 
 #GLOBALS
@@ -1218,10 +1222,7 @@ ivec2 multiview_uv(ivec2 uv) {
 }
 #endif
 
-uniform highp mat4 world_transform;
 uniform mediump float opaque_prepass_threshold;
-uniform highp uint model_flags;
-uniform highp uint instance_offset;
 
 #if defined(RENDER_MATERIAL)
 layout(location = 0) out vec4 albedo_output_buffer;