You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00: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:
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user