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

Merge pull request #93343 from Chaosus/shader_fix_canvas_ubo 

Fix ubo tag placement in canvas.glsl fragment shader
This commit is contained in:
Rémi Verschelde 2024-06-19 12:05:05 +02:00 committed by GitHub
parent 38716b94db 8ad878f06b
commit b75f0485ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gles3/shaders/canvas.glsl
View File

@ -346,14 +346,16 @@ uniform sampler2D color_texture; //texunit:0
layout(location = 0) out vec4 frag_color; layout(location = 0) out vec4 frag_color;
/* clang-format off */
// This needs to be outside clang-format so the ubo comment is in the right place
#ifdef MATERIAL_UNIFORMS_USED #ifdef MATERIAL_UNIFORMS_USED
layout(std140) uniform MaterialUniforms{ layout(std140) uniform MaterialUniforms{ //ubo:4
//ubo:4
#MATERIAL_UNIFORMS #MATERIAL_UNIFORMS
}; };
#endif #endif
/* clang-format on */
#GLOBALS #GLOBALS