diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-20 17:05:10 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-23 22:13:22 +0100 |
| commit | 5fd9d0891f8458f74ec7432c8198e72fef5a0aa1 (patch) | |
| tree | 9a897650a817c54ab07a5e20e2624aa46d4266d8 /drivers | |
| parent | 87d40ba743ff3a3a484db051c11b16559604efa9 (diff) | |
| download | redot-engine-5fd9d0891f8458f74ec7432c8198e72fef5a0aa1.tar.gz | |
SCons: Add proper MinGW support to D3D12 deps install script
Fix a couple GCC warnings.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/d3d12/d3d12ma.cpp | 1 | ||||
| -rw-r--r-- | drivers/d3d12/rendering_device_driver_d3d12.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/d3d12/d3d12ma.cpp b/drivers/d3d12/d3d12ma.cpp index ad7b4e570d..51171141de 100644 --- a/drivers/d3d12/d3d12ma.cpp +++ b/drivers/d3d12/d3d12ma.cpp @@ -42,6 +42,7 @@ #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wnonnull-compare" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif #if defined(_MSC_VER) diff --git a/drivers/d3d12/rendering_device_driver_d3d12.cpp b/drivers/d3d12/rendering_device_driver_d3d12.cpp index 8c92737374..6efef0fb34 100644 --- a/drivers/d3d12/rendering_device_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_device_driver_d3d12.cpp @@ -2885,7 +2885,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec uint32_t binding = (p_register % GODOT_NIR_DESCRIPTOR_SET_MULTIPLIER) / GODOT_NIR_BINDING_MULTIPLIER; DEV_ASSERT(set < (uint32_t)shader_data_in.sets_bindings.size()); - bool found = false; + [[maybe_unused]] bool found = false; for (int j = 0; j < shader_data_in.sets_bindings[set].size(); j++) { if (shader_data_in.sets_bindings[set][j].binding != binding) { continue; @@ -2903,7 +2903,6 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec } else { CRASH_NOW(); } - found = true; break; } @@ -2913,8 +2912,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec godot_nir_callbacks.report_sc_bit_offset_fn = [](uint32_t p_sc_id, uint64_t p_bit_offset, void *p_data) { ShaderData &shader_data_in = *(ShaderData *)p_data; - - bool found = false; + [[maybe_unused]] bool found = false; for (int j = 0; j < shader_data_in.specialization_constants.size(); j++) { if (shader_data_in.specialization_constants[j].constant_id != p_sc_id) { continue; @@ -2923,7 +2921,6 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec uint32_t offset_idx = SHADER_STAGES_BIT_OFFSET_INDICES[shader_data_in.stage]; DEV_ASSERT(shader_data_in.specialization_constants.write[j].stages_bit_offsets[offset_idx] == 0); shader_data_in.specialization_constants.write[j].stages_bit_offsets[offset_idx] = p_bit_offset; - found = true; break; } |