summaryrefslogtreecommitdiffstats
path: root/drivers/gles3/shaders
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:12:18 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:26:53 +0100
commit49f4860ce3e4122e17c869229701f7d86aa6956c (patch)
tree27c9dc9a7f00663854def367f6d085604ff98e20 /drivers/gles3/shaders
parent2f73a059cefadcd944b6874f2557ec82e46a562d (diff)
downloadredot-engine-49f4860ce3e4122e17c869229701f7d86aa6956c.tar.gz
Style: Mark clang-format 16 as supported for pre-commit hook
It only introduced a difference in a .glsl file, which I've worked around by removing an empty line. This keeps formatting consistent between clang-format 15 and 16. Also added a change in the 3-to-4 project converter to fix bogus formatting in clang-format < 17.
Diffstat (limited to 'drivers/gles3/shaders')
-rw-r--r--drivers/gles3/shaders/scene.glsl3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl
index 96e357e29e..41a43be3fe 100644
--- a/drivers/gles3/shaders/scene.glsl
+++ b/drivers/gles3/shaders/scene.glsl
@@ -604,8 +604,7 @@ layout(std140) uniform GlobalShaderUniformData { //ubo:1
vec4 global_shader_uniforms[MAX_GLOBAL_SHADER_UNIFORMS];
};
- /* Material Uniforms */
-
+/* Material Uniforms */
#ifdef MATERIAL_UNIFORMS_USED
/* clang-format off */