Skip to content

Commit b75f048

Browse files
authored
Merge pull request #93343 from Chaosus/shader_fix_canvas_ubo
Fix ubo tag placement in canvas.glsl fragment shader
2 parents 38716b9 + 8ad878f commit b75f048

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gles3/shaders/canvas.glsl

+4-2
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,16 @@ uniform sampler2D color_texture; //texunit:0
346346

347347
layout(location = 0) out vec4 frag_color;
348348

349+
/* clang-format off */
350+
// This needs to be outside clang-format so the ubo comment is in the right place
349351
#ifdef MATERIAL_UNIFORMS_USED
350-
layout(std140) uniform MaterialUniforms{
351-
//ubo:4
352+
layout(std140) uniform MaterialUniforms{ //ubo:4
352353

353354
#MATERIAL_UNIFORMS
354355

355356
};
356357
#endif
358+
/* clang-format on */
357359

358360
#GLOBALS
359361

0 commit comments

Comments
 (0)