Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move uniform variables up in the gles3/scene.glsl template so that they are available within the #GLOBALS scope #100125

Merged
merged 1 commit into from
Dec 14, 2024
+4 −3
Merged

Move uniform variables up in the gles3/scene.glsl template so that they are available within the #GLOBALS scope #100125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions drivers/gles3/shaders/scene.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,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
Expand Down Expand Up @@ -1199,10 +1203,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;
Expand Down