mirror of
https://github.com/godotengine/godot.git
synced 2024-11-21 19:42:43 +00:00
Merge pull request #97483 from akien-mga/clang-format-19.1.0
CI: Update `clang-format` pre-commit hook to 19.1.0
This commit is contained in:
commit
a4c1804cab
@ -9,7 +9,7 @@ exclude: |
|
|||||||
|
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||||
rev: v18.1.8
|
rev: v19.1.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: clang-format
|
- id: clang-format
|
||||||
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
|
files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
|
||||||
|
@ -204,7 +204,7 @@ public:
|
|||||||
static Int128 mul(uint64_t a, uint64_t b);
|
static Int128 mul(uint64_t a, uint64_t b);
|
||||||
|
|
||||||
Int128 operator-() const {
|
Int128 operator-() const {
|
||||||
return Int128((uint64_t) - (int64_t)low, ~high + (low == 0));
|
return Int128(uint64_t(-int64_t(low)), ~high + (low == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
Int128 operator+(const Int128 &b) const {
|
Int128 operator+(const Int128 &b) const {
|
||||||
|
@ -3244,7 +3244,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
|
|||||||
DEV_ASSERT(binding_info.res_class == (uint32_t)RES_CLASS_INVALID || binding_info.res_class == (uint32_t)res_class);
|
DEV_ASSERT(binding_info.res_class == (uint32_t)RES_CLASS_INVALID || binding_info.res_class == (uint32_t)res_class);
|
||||||
binding_info.res_class = res_class;
|
binding_info.res_class = res_class;
|
||||||
} else if (p_dxil_type == DXIL_RES_SAMPLER) {
|
} else if (p_dxil_type == DXIL_RES_SAMPLER) {
|
||||||
binding_info.has_sampler = (uint32_t) true;
|
binding_info.has_sampler = (uint32_t)true;
|
||||||
} else {
|
} else {
|
||||||
CRASH_NOW();
|
CRASH_NOW();
|
||||||
}
|
}
|
||||||
|
@ -169,7 +169,7 @@ public:
|
|||||||
static VkAllocationCallbacks *get_allocation_callbacks(VkObjectType p_type);
|
static VkAllocationCallbacks *get_allocation_callbacks(VkObjectType p_type);
|
||||||
|
|
||||||
#if defined(VK_TRACK_DRIVER_MEMORY) || defined(VK_TRACK_DEVICE_MEMORY)
|
#if defined(VK_TRACK_DRIVER_MEMORY) || defined(VK_TRACK_DEVICE_MEMORY)
|
||||||
enum VkTrackedObjectType{
|
enum VkTrackedObjectType {
|
||||||
VK_TRACKED_OBJECT_DESCRIPTOR_UPDATE_TEMPLATE_KHR = VK_OBJECT_TYPE_COMMAND_POOL + 1,
|
VK_TRACKED_OBJECT_DESCRIPTOR_UPDATE_TEMPLATE_KHR = VK_OBJECT_TYPE_COMMAND_POOL + 1,
|
||||||
VK_TRACKED_OBJECT_TYPE_SURFACE,
|
VK_TRACKED_OBJECT_TYPE_SURFACE,
|
||||||
VK_TRACKED_OBJECT_TYPE_SWAPCHAIN,
|
VK_TRACKED_OBJECT_TYPE_SWAPCHAIN,
|
||||||
@ -180,7 +180,7 @@ public:
|
|||||||
VK_TRACKED_OBJECT_TYPE_COUNT
|
VK_TRACKED_OBJECT_TYPE_COUNT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum VkTrackedSystemAllocationScope{
|
enum VkTrackedSystemAllocationScope {
|
||||||
VK_TRACKED_SYSTEM_ALLOCATION_SCOPE_COUNT = VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE + 1
|
VK_TRACKED_SYSTEM_ALLOCATION_SCOPE_COUNT = VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE + 1
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
@ -48,9 +48,9 @@ Error AudioDriverXAudio2::init() {
|
|||||||
int latency = Engine::get_singleton()->get_audio_output_latency();
|
int latency = Engine::get_singleton()->get_audio_output_latency();
|
||||||
buffer_size = closest_power_of_2(latency * mix_rate / 1000);
|
buffer_size = closest_power_of_2(latency * mix_rate / 1000);
|
||||||
|
|
||||||
samples_in = memnew_arr(int32_t, buffer_size * channels);
|
samples_in = memnew_arr(int32_t, size_t(buffer_size) * channels);
|
||||||
for (int i = 0; i < AUDIO_BUFFERS; i++) {
|
for (int i = 0; i < AUDIO_BUFFERS; i++) {
|
||||||
samples_out[i] = memnew_arr(int16_t, buffer_size * channels);
|
samples_out[i] = memnew_arr(int16_t, size_t(buffer_size) * channels);
|
||||||
xaudio_buffer[i].AudioBytes = buffer_size * channels * sizeof(int16_t);
|
xaudio_buffer[i].AudioBytes = buffer_size * channels * sizeof(int16_t);
|
||||||
xaudio_buffer[i].pAudioData = (const BYTE *)(samples_out[i]);
|
xaudio_buffer[i].pAudioData = (const BYTE *)(samples_out[i]);
|
||||||
xaudio_buffer[i].Flags = 0;
|
xaudio_buffer[i].Flags = 0;
|
||||||
|
@ -485,7 +485,7 @@ void trace_direct_light(vec3 p_position, vec3 p_normal, uint p_light_index, bool
|
|||||||
|
|
||||||
float a = randomize(r_noise) * 2.0 * PI;
|
float a = randomize(r_noise) * 2.0 * PI;
|
||||||
float vogel_index = float(total_ray_count - 1 - (i * shadowing_ray_count + j)); // Start from (total_ray_count - 1) so we check the outer points first.
|
float vogel_index = float(total_ray_count - 1 - (i * shadowing_ray_count + j)); // Start from (total_ray_count - 1) so we check the outer points first.
|
||||||
vec2 light_disk_sample = (get_vogel_disk(vogel_index, a, shadowing_ray_count_sqrt)) * soft_shadowing_disk_size * light_data.shadow_blur;
|
vec2 light_disk_sample = get_vogel_disk(vogel_index, a, shadowing_ray_count_sqrt) * soft_shadowing_disk_size * light_data.shadow_blur;
|
||||||
vec3 light_disk_to_point = normalize(light_to_point + light_disk_sample.x * light_to_point_tan + light_disk_sample.y * light_to_point_bitan);
|
vec3 light_disk_to_point = normalize(light_to_point + light_disk_sample.x * light_to_point_tan + light_disk_sample.y * light_to_point_bitan);
|
||||||
// Offset the ray origin for AA, offset the light position for soft shadows.
|
// Offset the ray origin for AA, offset the light position for soft shadows.
|
||||||
if (trace_ray_any_hit(origin - light_disk_to_point * (bake_params.bias + length(disk_sample)), p_position - light_disk_to_point * dist) == RAY_MISS) {
|
if (trace_ray_any_hit(origin - light_disk_to_point * (bake_params.bias + length(disk_sample)), p_position - light_disk_to_point * dist) == RAY_MISS) {
|
||||||
|
@ -47,7 +47,7 @@ class JavaClass : public RefCounted {
|
|||||||
GDCLASS(JavaClass, RefCounted);
|
GDCLASS(JavaClass, RefCounted);
|
||||||
|
|
||||||
#ifdef ANDROID_ENABLED
|
#ifdef ANDROID_ENABLED
|
||||||
enum ArgumentType{
|
enum ArgumentType {
|
||||||
ARG_TYPE_VOID,
|
ARG_TYPE_VOID,
|
||||||
ARG_TYPE_BOOLEAN,
|
ARG_TYPE_BOOLEAN,
|
||||||
ARG_TYPE_BYTE,
|
ARG_TYPE_BYTE,
|
||||||
|
@ -665,7 +665,7 @@ private:
|
|||||||
.preferred_buffer_transform = _wl_surface_on_preferred_buffer_transform,
|
.preferred_buffer_transform = _wl_surface_on_preferred_buffer_transform,
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr struct wl_callback_listener frame_wl_callback_listener {
|
static constexpr struct wl_callback_listener frame_wl_callback_listener = {
|
||||||
.done = _frame_wl_callback_on_done,
|
.done = _frame_wl_callback_on_done,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -683,7 +683,7 @@ private:
|
|||||||
.name = _wl_seat_on_name,
|
.name = _wl_seat_on_name,
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr struct wl_callback_listener cursor_frame_callback_listener {
|
static constexpr struct wl_callback_listener cursor_frame_callback_listener = {
|
||||||
.done = _cursor_frame_callback_on_done,
|
.done = _cursor_frame_callback_on_done,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -472,7 +472,7 @@ double ScrollBar::get_area_size() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
double ScrollBar::get_grabber_offset() const {
|
double ScrollBar::get_grabber_offset() const {
|
||||||
return (get_area_size()) * get_as_ratio();
|
return get_area_size() * get_as_ratio();
|
||||||
}
|
}
|
||||||
|
|
||||||
Size2 ScrollBar::get_minimum_size() const {
|
Size2 ScrollBar::get_minimum_size() const {
|
||||||
|
@ -45,7 +45,7 @@ Error AudioDriverDummy::init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
channels = get_channels();
|
channels = get_channels();
|
||||||
samples_in = memnew_arr(int32_t, (size_t)buffer_frames * channels);
|
samples_in = memnew_arr(int32_t, size_t(buffer_frames) * channels);
|
||||||
|
|
||||||
if (use_threads) {
|
if (use_threads) {
|
||||||
thread.start(AudioDriverDummy::thread_func, this);
|
thread.start(AudioDriverDummy::thread_func, this);
|
||||||
|
@ -800,7 +800,7 @@ private:
|
|||||||
|
|
||||||
#ifndef DISABLE_DEPRECATED
|
#ifndef DISABLE_DEPRECATED
|
||||||
public:
|
public:
|
||||||
enum BarrierMask{
|
enum BarrierMask {
|
||||||
BARRIER_MASK_VERTEX = 1,
|
BARRIER_MASK_VERTEX = 1,
|
||||||
BARRIER_MASK_FRAGMENT = 8,
|
BARRIER_MASK_FRAGMENT = 8,
|
||||||
BARRIER_MASK_COMPUTE = 2,
|
BARRIER_MASK_COMPUTE = 2,
|
||||||
|
@ -1740,7 +1740,7 @@ public:
|
|||||||
|
|
||||||
#ifndef DISABLE_DEPRECATED
|
#ifndef DISABLE_DEPRECATED
|
||||||
// Never actually used, should be removed when we can break compatibility.
|
// Never actually used, should be removed when we can break compatibility.
|
||||||
enum Features{
|
enum Features {
|
||||||
FEATURE_SHADERS,
|
FEATURE_SHADERS,
|
||||||
FEATURE_MULTITHREADED,
|
FEATURE_MULTITHREADED,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user