Skip to content

Commit 736dcf7

Browse files
committed
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
2 parents e0cdba4 + c153c5b commit 736dcf7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gles3/shaders/scene.glsl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,10 @@ layout(std140) uniform MultiviewData { // ubo:8
986986
multiview_data;
987987
#endif
988988

989+
uniform highp mat4 world_transform;
990+
uniform highp uint instance_offset;
991+
uniform highp uint model_flags;
992+
989993
/* clang-format off */
990994

991995
#GLOBALS
@@ -1218,10 +1222,7 @@ ivec2 multiview_uv(ivec2 uv) {
12181222
}
12191223
#endif
12201224

1221-
uniform highp mat4 world_transform;
12221225
uniform mediump float opaque_prepass_threshold;
1223-
uniform highp uint model_flags;
1224-
uniform highp uint instance_offset;
12251226

12261227
#if defined(RENDER_MATERIAL)
12271228
layout(location = 0) out vec4 albedo_output_buffer;

0 commit comments

Comments
 (0)