Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: Apply fixes from clang-format 18.1.3

Browse source
This commit is contained in:
Rémi Verschelde 2025-04-25 15:07:01 +02:00
parent 9a8b5848d8
commit 2fea5c0a66
No known key found for this signature in database
GPG key ID: C3336907360768E1
47 changed files with 237 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/windows_builds.yml vendored
View file

@ -6,7 +6,7 @@ on:
# SCONS_CACHE for windows must be set in the build environment
env:
# Used for the cache key. Add version suffix to force clean build.
GODOT_BASE_BRANCH: 4.0
GODOT_BASE_BRANCH: "4.0"
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
SCONS_CACHE_MSVC_CONFIG: true

2
drivers/gles3/shaders/sky.glsl
View file

@ -190,9 +190,7 @@ void main() {
#endif
{
#CODE : SKY
}
color *= luminance_multiplier;

3
editor/project_converter_3_to_4.cpp
View file

@ -995,7 +995,8 @@ bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
// get_object_of_execution
{
{ String base = "var roman = kieliszek.";
{
String base = "var roman = kieliszek.";
String expected = "kieliszek.";
String got = get_object_of_execution(base);
if (got != expected) {

10
servers/rendering/renderer_rd/shaders/canvas.glsl
View file

@ -28,10 +28,9 @@ layout(location = 3) out vec2 pixel_size_interp;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 1, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
#GLOBALS
@ -225,10 +224,9 @@ layout(location = 0) out vec4 frag_color;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 1, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
vec2 screen_uv_to_sdf(vec2 p_uv) {

5
servers/rendering/renderer_rd/shaders/environment/sky.glsl
View file

@ -120,7 +120,8 @@ directional_lights;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 1, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
layout(set = 2, binding = 0) uniform textureCube radiance;
@ -252,9 +253,7 @@ void main() {
#endif //USE_CUBEMAP_PASS
{
#CODE : SKY
}
frag_color.rgb = color;

3
servers/rendering/renderer_rd/shaders/environment/volumetric_fog.glsl
View file

@ -92,7 +92,8 @@ layout(r32ui, set = 1, binding = 4) uniform volatile uimage3D light_only_map;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 2, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
#GLOBALS

8
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View file

@ -98,7 +98,8 @@ layout(location = 8) out vec4 prev_screen_position;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = MATERIAL_UNIFORM_SET, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
float global_time;
@ -582,10 +583,9 @@ vec2 multiview_uv(vec2 uv) {
#ifdef MATERIAL_UNIFORMS_USED
layout(set = MATERIAL_UNIFORM_SET, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
#GLOBALS

10
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View file

@ -93,10 +93,9 @@ layout(location = 6) mediump out vec3 binormal_interp;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = MATERIAL_UNIFORM_SET, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
#ifdef MODE_DUAL_PARABOLOID
@ -557,10 +556,9 @@ vec2 multiview_uv(vec2 uv) {
#ifdef MATERIAL_UNIFORMS_USED
layout(set = MATERIAL_UNIFORM_SET, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
#GLOBALS

5
servers/rendering/renderer_rd/shaders/particles.glsl
View file

@ -180,10 +180,9 @@ layout(set = 2, binding = 1) uniform texture2D height_field_texture;
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 3, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
layout(push_constant, std430) uniform Params {