godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases 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:32:25 +02:00
parent c8169ea274
commit a6c5fc2720
46 changed files with 142 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/display_server.h
View File

@@ -359,7 +359,7 @@ public:
virtual void delete_sub_window(WindowID p_id);
virtual WindowID window_get_active_popup() const { return INVALID_WINDOW_ID; };
virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect){};
virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {};
virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const { return Rect2i(); };
virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const;
@@ -503,7 +503,7 @@ public:
virtual int tablet_get_driver_count() const { return 1; };
virtual String tablet_get_driver_name(int p_driver) const { return "default"; };
virtual String tablet_get_current_driver() const { return "default"; };
virtual void tablet_set_current_driver(const String &p_driver){};
virtual void tablet_set_current_driver(const String &p_driver) {};
virtual void process_events() = 0;

2
servers/physics_3d/godot_soft_body_3d.cpp
View File

@@ -597,7 +597,7 @@ void GodotSoftBody3D::generate_bending_constraints(int p_distance) {
const uint32_t adj_size = n * n;
unsigned *adj = memnew_arr(unsigned, adj_size);
#define IDX(_x_, _y_) ((_y_)*n + (_x_))
#define IDX(_x_, _y_) ((_y_) * n + (_x_))
for (j = 0; j < n; ++j) {
for (i = 0; i < n; ++i) {
int idx_ij = j * n + i;

4
servers/rendering/dummy/storage/material_storage.h
View File

@@ -60,7 +60,7 @@ public:
virtual RID shader_allocate() override { return RID(); }
virtual void shader_initialize(RID p_rid) override {}
virtual void shader_free(RID p_rid) override{};
virtual void shader_free(RID p_rid) override {};
virtual void shader_set_code(RID p_shader, const String &p_code) override {}
virtual void shader_set_path_hint(RID p_shader, const String &p_code) override {}
@@ -77,7 +77,7 @@ public:
/* MATERIAL API */
virtual RID material_allocate() override { return RID(); }
virtual void material_initialize(RID p_rid) override {}
virtual void material_free(RID p_rid) override{};
virtual void material_free(RID p_rid) override {};
virtual void material_set_render_priority(RID p_material, int priority) override {}
virtual void material_set_shader(RID p_shader_material, RID p_shader) override {}

46
servers/rendering/dummy/storage/texture_storage.h
View File

@@ -58,14 +58,14 @@ public:
/* Canvas Texture API */
virtual RID canvas_texture_allocate() override { return RID(); };
virtual void canvas_texture_initialize(RID p_rid) override{};
virtual void canvas_texture_free(RID p_rid) override{};
virtual void canvas_texture_initialize(RID p_rid) override {};
virtual void canvas_texture_free(RID p_rid) override {};
virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) override{};
virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) override{};
virtual void canvas_texture_set_channel(RID p_canvas_texture, RS::CanvasTextureChannel p_channel, RID p_texture) override {};
virtual void canvas_texture_set_shading_parameters(RID p_canvas_texture, const Color &p_base_color, float p_shininess) override {};
virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) override{};
virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) override{};
virtual void canvas_texture_set_texture_filter(RID p_item, RS::CanvasItemTextureFilter p_filter) override {};
virtual void canvas_texture_set_texture_repeat(RID p_item, RS::CanvasItemTextureRepeat p_repeat) override {};
/* Texture API */
@@ -90,18 +90,18 @@ public:
ERR_FAIL_COND(!t);
t->image = p_image->duplicate();
};
virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) override{};
virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) override{};
virtual void texture_proxy_initialize(RID p_texture, RID p_base) override{}; //all slices, then all the mipmaps, must be coherent
virtual void texture_2d_layered_initialize(RID p_texture, const Vector<Ref<Image>> &p_layers, RS::TextureLayeredType p_layered_type) override {};
virtual void texture_3d_initialize(RID p_texture, Image::Format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector<Ref<Image>> &p_data) override {};
virtual void texture_proxy_initialize(RID p_texture, RID p_base) override {}; //all slices, then all the mipmaps, must be coherent
virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) override{};
virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) override{};
virtual void texture_proxy_update(RID p_proxy, RID p_base) override{};
virtual void texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) override {};
virtual void texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) override {};
virtual void texture_proxy_update(RID p_proxy, RID p_base) override {};
//these two APIs can be used together or in combination with the others.
virtual void texture_2d_placeholder_initialize(RID p_texture) override{};
virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) override{};
virtual void texture_3d_placeholder_initialize(RID p_texture) override{};
virtual void texture_2d_placeholder_initialize(RID p_texture) override {};
virtual void texture_2d_layered_placeholder_initialize(RID p_texture, RenderingServer::TextureLayeredType p_layered_type) override {};
virtual void texture_3d_placeholder_initialize(RID p_texture) override {};
virtual Ref<Image> texture_2d_get(RID p_texture) const override {
DummyTexture *t = texture_owner.get_or_null(p_texture);
@@ -112,18 +112,18 @@ public:
virtual Vector<Ref<Image>> texture_3d_get(RID p_texture) const override { return Vector<Ref<Image>>(); };
virtual void texture_replace(RID p_texture, RID p_by_texture) override { texture_free(p_by_texture); };
virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) override{};
virtual void texture_set_size_override(RID p_texture, int p_width, int p_height) override {};
virtual void texture_set_path(RID p_texture, const String &p_path) override{};
virtual void texture_set_path(RID p_texture, const String &p_path) override {};
virtual String texture_get_path(RID p_texture) const override { return String(); };
virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override{};
virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override{};
virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) override{};
virtual void texture_set_detect_3d_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override {};
virtual void texture_set_detect_normal_callback(RID p_texture, RS::TextureDetectCallback p_callback, void *p_userdata) override {};
virtual void texture_set_detect_roughness_callback(RID p_texture, RS::TextureDetectRoughnessCallback p_callback, void *p_userdata) override {};
virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) override{};
virtual void texture_debug_usage(List<RS::TextureInfo> *r_info) override {};
virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) override{};
virtual void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) override {};
virtual Size2 texture_size_with_proxy(RID p_proxy) override { return Size2(); };
@@ -133,7 +133,7 @@ public:
/* DECAL API */
virtual RID decal_allocate() override { return RID(); }
virtual void decal_initialize(RID p_rid) override {}
virtual void decal_free(RID p_rid) override{};
virtual void decal_free(RID p_rid) override {};
virtual void decal_set_size(RID p_decal, const Vector3 &p_size) override {}
virtual void decal_set_texture(RID p_decal, RS::DecalTexture p_type, RID p_texture) override {}

4
servers/rendering/renderer_rd/environment/fog.h
View File

@@ -314,8 +314,8 @@ public:
int last_shadow_filter = -1;
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override{};
virtual void free_data() override{};
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override {};
virtual void free_data() override {};
bool sync_gi_dependent_sets_validity(bool p_ensure_freed = false);

4
servers/rendering/renderer_rd/environment/gi.h
View File

@@ -461,7 +461,7 @@ public:
RID get_voxel_gi_buffer();
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override{};
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override {};
virtual void free_data() override;
};
@@ -672,7 +672,7 @@ public:
int32_t cascade_dynamic_light_count[SDFGI::MAX_CASCADES]; //used dynamically
RID integrate_sky_uniform_set;
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override{};
virtual void configure(RenderSceneBuffersRD *p_render_buffers) override {};
virtual void free_data() override;
~SDFGI();

10
servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
View File

@@ -360,12 +360,12 @@ protected:
virtual RID _render_buffers_get_normal_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
virtual RID _render_buffers_get_velocity_texture(Ref<RenderSceneBuffersRD> p_render_buffers) override;
virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override{};
virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override{};
virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override{};
virtual void environment_set_ssao_quality(RS::EnvironmentSSAOQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {};
virtual void environment_set_ssil_quality(RS::EnvironmentSSILQuality p_quality, bool p_half_size, float p_adaptive_target, int p_blur_passes, float p_fadeout_from, float p_fadeout_to) override {};
virtual void environment_set_ssr_roughness_quality(RS::EnvironmentSSRRoughnessQuality p_quality) override {};
virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override{};
virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override{};
virtual void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override {};
virtual void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override {};
/* Geometry instance */

8
servers/rendering/renderer_rd/renderer_scene_render_rd.h
View File

@@ -204,9 +204,9 @@ public:
/* LIGHTING */
virtual void setup_added_reflection_probe(const Transform3D &p_transform, const Vector3 &p_half_size){};
virtual void setup_added_light(const RS::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture){};
virtual void setup_added_decal(const Transform3D &p_transform, const Vector3 &p_half_size){};
virtual void setup_added_reflection_probe(const Transform3D &p_transform, const Vector3 &p_half_size) {};
virtual void setup_added_light(const RS::LightType p_type, const Transform3D &p_transform, float p_radius, float p_spot_aperture) {};
virtual void setup_added_decal(const Transform3D &p_transform, const Vector3 &p_half_size) {};
/* GI */
@@ -278,7 +278,7 @@ public:
RID render_buffers_get_default_voxel_gi_buffer();
virtual void base_uniforms_changed() = 0;
virtual void update_uniform_sets(){};
virtual void update_uniform_sets() {};
virtual void render_scene(const Ref<RenderSceneBuffers> &p_render_buffers, const CameraData *p_camera_data, const CameraData *p_prev_camera_data, const PagedArray<RenderGeometryInstance *> &p_instances, const PagedArray<RID> &p_lights, const PagedArray<RID> &p_reflection_probes, const PagedArray<RID> &p_voxel_gi_instances, const PagedArray<RID> &p_decals, const PagedArray<RID> &p_lightmaps, const PagedArray<RID> &p_fog_volumes, RID p_environment, RID p_camera_attributes, RID p_shadow_atlas, RID p_occluder_debug_tex, RID p_reflection_atlas, RID p_reflection_probe, int p_reflection_probe_pass, float p_screen_mesh_lod_threshold, const RenderShadowData *p_render_shadows, int p_render_shadow_count, const RenderSDFGIData *p_render_sdfgi_regions, int p_render_sdfgi_region_count, const RenderSDFGIUpdateData *p_sdfgi_update_data = nullptr, RenderingMethod::RenderInfo *r_render_info = nullptr) override;

14
servers/rendering/renderer_rd/shaders/canvas.glsl
View File

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

7
servers/rendering/renderer_rd/shaders/environment/sky.glsl
View File

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

5
servers/rendering/renderer_rd/shaders/environment/volumetric_fog.glsl
View File

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

12
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View File

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

14
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

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

7
servers/rendering/renderer_rd/shaders/particles.glsl
View File

@@ -179,11 +179,10 @@ layout(set = 2, binding = 1) uniform texture2D height_field_texture;
/* SET 3: MATERIAL */
#ifdef MATERIAL_UNIFORMS_USED
layout(set = 3, binding = 0, std140) uniform MaterialUniforms{
layout(set = 3, binding = 0, std140) uniform MaterialUniforms {
#MATERIAL_UNIFORMS
} material;
}
material;
#endif
layout(push_constant, std430) uniform Params {

4
servers/xr/xr_interface.h
View File

@@ -133,10 +133,10 @@ public:
virtual RID get_velocity_texture(); /* obtain velocity output texture (if applicable, used for spacewarp) */
virtual void process() = 0;
virtual void pre_render(){};
virtual void pre_render() {};
virtual bool pre_draw_viewport(RID p_render_target) { return true; }; /* inform XR interface we are about to start our viewport draw process */
virtual Vector<BlitToScreen> post_draw_viewport(RID p_render_target, const Rect2 &p_screen_rect) = 0; /* inform XR interface we finished our viewport draw process */
virtual void end_frame(){};
virtual void end_frame() {};
/** passthrough **/