godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

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
This commit is contained in:
Rémi Verschelde 2024-12-14 18:25:38 +01:00
parent e0cdba40fd c153c5b3cf
commit 736dcf72cc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gles3/shaders/scene.glsl
View File

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