diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2024-06-19 12:05:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-19 12:05:05 +0200 |
commit | b75f0485ba15951b87f1d9a2d8dd0fcd55e178e4 (patch) | |
tree | 250bba30c255899bb24d38d2e024144698dd386d | |
parent | 38716b94dbcc9dbfb60a49399c5118f01fc79c45 (diff) | |
parent | 8ad878f06b70a6968c96d5443934b6b39d164e1a (diff) | |
download | redot-engine-b75f0485ba15951b87f1d9a2d8dd0fcd55e178e4.tar.gz |
Merge pull request #93343 from Chaosus/shader_fix_canvas_ubo
Fix ubo tag placement in canvas.glsl fragment shader
-rw-r--r-- | drivers/gles3/shaders/canvas.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 65332c06be..4eb6f62482 100644 --- 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 |