Merge pull request #93343 from Chaosus/shader_fix_canvas_ubo

Fix ubo tag placement in canvas.glsl fragment shader
godotengine · Jun 19, 2024 · b75f048 · b75f048
2 parents 38716b9 + 8ad878f
commit b75f048
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl
@@ -346,14 +346,16 @@ uniform sampler2D color_texture; //texunit:0
 
 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
-layout(std140) uniform MaterialUniforms{
-//ubo:4
+layout(std140) uniform MaterialUniforms{ //ubo:4
 
 #MATERIAL_UNIFORMS
 
 };
 #endif
+/* clang-format on */
 
 #GLOBALS