mirror of
https://github.com/godotengine/godot.git
synced 2025-03-07 23:32:58 +08:00
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:
commit
736dcf72cc
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user