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
commit b75f0485ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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