diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 3dc0b0d5..eb9bc241 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,6 +1,5 @@ add_library(common align.h - assert.h audio_stream.cpp audio_stream.h bitfield.h diff --git a/src/common/assert.h b/src/common/assert.h deleted file mode 100644 index 72596aec..00000000 --- a/src/common/assert.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// Helper for switch cases. -#define DefaultCaseIsUnreachable() \ - default: \ - break diff --git a/src/common/audio_stream.cpp b/src/common/audio_stream.cpp index 86e755dd..d0c1ff52 100644 --- a/src/common/audio_stream.cpp +++ b/src/common/audio_stream.cpp @@ -1,5 +1,4 @@ #include "audio_stream.h" -#include "assert.h" #include #include diff --git a/src/common/byte_stream.cpp b/src/common/byte_stream.cpp index 66644624..52620df2 100644 --- a/src/common/byte_stream.cpp +++ b/src/common/byte_stream.cpp @@ -1,5 +1,4 @@ #include "byte_stream.h" -#include "assert.h" #include "file_system.h" #include "string_util.h" #include diff --git a/src/common/cd_image.cpp b/src/common/cd_image.cpp index 9ba5aed7..8accbf97 100644 --- a/src/common/cd_image.cpp +++ b/src/common/cd_image.cpp @@ -1,5 +1,4 @@ #include "cd_image.h" -#include "assert.h" #include "file_system.h" #include "log.h" #include "string_util.h" diff --git a/src/common/cd_image_chd.cpp b/src/common/cd_image_chd.cpp index b8754957..481e7320 100644 --- a/src/common/cd_image_chd.cpp +++ b/src/common/cd_image_chd.cpp @@ -3,7 +3,6 @@ #endif #include "align.h" -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "error.h" diff --git a/src/common/cd_image_cue.cpp b/src/common/cd_image_cue.cpp index 09f15d9d..4b91ef89 100644 --- a/src/common/cd_image_cue.cpp +++ b/src/common/cd_image_cue.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "cue_parser.h" diff --git a/src/common/cd_image_device.cpp b/src/common/cd_image_device.cpp index 35ff15e2..2088b367 100644 --- a/src/common/cd_image_device.cpp +++ b/src/common/cd_image_device.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "error.h" #include "string_util.h" diff --git a/src/common/cd_image_ecm.cpp b/src/common/cd_image_ecm.cpp index dc81eac7..42eefb1d 100644 --- a/src/common/cd_image_ecm.cpp +++ b/src/common/cd_image_ecm.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "error.h" diff --git a/src/common/cd_image_m3u.cpp b/src/common/cd_image_m3u.cpp index 649e6c6d..cd08405e 100644 --- a/src/common/cd_image_m3u.cpp +++ b/src/common/cd_image_m3u.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "error.h" diff --git a/src/common/cd_image_memory.cpp b/src/common/cd_image_memory.cpp index 92403f27..a8f7d97f 100644 --- a/src/common/cd_image_memory.cpp +++ b/src/common/cd_image_memory.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "file_system.h" diff --git a/src/common/cd_image_pbp.cpp b/src/common/cd_image_pbp.cpp index d12f9301..6d718e55 100644 --- a/src/common/cd_image_pbp.cpp +++ b/src/common/cd_image_pbp.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "error.h" diff --git a/src/common/cd_image_ppf.cpp b/src/common/cd_image_ppf.cpp index 94a93d51..8eab0c34 100644 --- a/src/common/cd_image_ppf.cpp +++ b/src/common/cd_image_ppf.cpp @@ -1,4 +1,3 @@ -#include "assert.h" #include "cd_image.h" #include "cd_subchannel_replacement.h" #include "file_system.h" diff --git a/src/common/d3d11/staging_texture.cpp b/src/common/d3d11/staging_texture.cpp index 3ccf46f1..96c5a4df 100644 --- a/src/common/d3d11/staging_texture.cpp +++ b/src/common/d3d11/staging_texture.cpp @@ -1,7 +1,4 @@ #include "staging_texture.h" -#include "../assert.h" -#include "../log.h" -Log_SetChannel(D3D11); namespace D3D11 { @@ -20,10 +17,7 @@ bool StagingTexture::Create(ID3D11Device* device, u32 width, u32 height, DXGI_FO ComPtr texture; const HRESULT tex_hr = device->CreateTexture2D(&desc, nullptr, texture.GetAddressOf()); if (FAILED(tex_hr)) - { - Log_ErrorPrintf("Create texture failed: 0x%08X", tex_hr); return false; - } m_texture = std::move(texture); m_width = desc.Width; @@ -41,10 +35,7 @@ bool StagingTexture::Map(ID3D11DeviceContext* context, bool writing) { const HRESULT hr = context->Map(m_texture.Get(), 0, writing ? D3D11_MAP_WRITE : D3D11_MAP_READ, 0, &m_map); if (FAILED(hr)) - { - Log_ErrorPrintf("Map staging texture failed: 0x%08X", hr); return false; - } return true; } @@ -78,10 +69,7 @@ bool AutoStagingTexture::EnsureSize(ID3D11DeviceContext* context, u32 width, u32 ComPtr new_texture; HRESULT hr = device->CreateTexture2D(&new_desc, nullptr, new_texture.GetAddressOf()); if (FAILED(hr)) - { - Log_ErrorPrintf("Create texture failed: 0x%08X", hr); return false; - } m_texture = std::move(new_texture); m_width = width; diff --git a/src/common/d3d11/stream_buffer.cpp b/src/common/d3d11/stream_buffer.cpp index d4e1858b..630be68d 100644 --- a/src/common/d3d11/stream_buffer.cpp +++ b/src/common/d3d11/stream_buffer.cpp @@ -1,6 +1,5 @@ #include "stream_buffer.h" #include "../align.h" -#include "../assert.h" #include "../log.h" Log_SetChannel(D3D11); diff --git a/src/common/d3d12/context.cpp b/src/common/d3d12/context.cpp index 3c4c725e..e5eb4a63 100644 --- a/src/common/d3d12/context.cpp +++ b/src/common/d3d12/context.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "context.h" -#include "../assert.h" #include "../log.h" #include "../scope_guard.h" #include diff --git a/src/common/d3d12/descriptor_heap_manager.cpp b/src/common/d3d12/descriptor_heap_manager.cpp index 3432b74b..2c1bebf5 100644 --- a/src/common/d3d12/descriptor_heap_manager.cpp +++ b/src/common/d3d12/descriptor_heap_manager.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "descriptor_heap_manager.h" -#include "../assert.h" #include "../log.h" #include "context.h" Log_SetChannel(DescriptorHeapManager); diff --git a/src/common/d3d12/staging_texture.cpp b/src/common/d3d12/staging_texture.cpp index b12d6330..ed30414d 100644 --- a/src/common/d3d12/staging_texture.cpp +++ b/src/common/d3d12/staging_texture.cpp @@ -1,6 +1,5 @@ #include "staging_texture.h" #include "../align.h" -#include "../assert.h" #include "../log.h" #include "context.h" #include "util.h" diff --git a/src/common/d3d12/stream_buffer.cpp b/src/common/d3d12/stream_buffer.cpp index 3296f2ff..7b858358 100644 --- a/src/common/d3d12/stream_buffer.cpp +++ b/src/common/d3d12/stream_buffer.cpp @@ -4,7 +4,6 @@ #include "stream_buffer.h" #include "../align.h" -#include "../assert.h" #include "../log.h" #include "context.h" #include diff --git a/src/common/d3d12/texture.cpp b/src/common/d3d12/texture.cpp index 499bd3d9..0d77554a 100644 --- a/src/common/d3d12/texture.cpp +++ b/src/common/d3d12/texture.cpp @@ -1,6 +1,5 @@ #include "texture.h" #include "../align.h" -#include "../assert.h" #include "../log.h" #include "context.h" #include "staging_texture.h" diff --git a/src/common/d3d12/util.cpp b/src/common/d3d12/util.cpp index d6ff2c31..c74757a8 100644 --- a/src/common/d3d12/util.cpp +++ b/src/common/d3d12/util.cpp @@ -1,5 +1,4 @@ #include "util.h" -#include "../assert.h" #include "../log.h" #include "../string.h" #include "../string_util.h" diff --git a/src/common/event.cpp b/src/common/event.cpp index a71d2135..8c5f3966 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1,5 +1,4 @@ #include "event.h" -#include "assert.h" #if defined(_WIN32) #include "windows_headers.h" diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 658cbc5c..c1d40e77 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -1,5 +1,4 @@ #pragma once -#include "assert.h" #include "types.h" #include #include diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp index cbb380fb..efda6a80 100644 --- a/src/common/file_system.cpp +++ b/src/common/file_system.cpp @@ -1,5 +1,4 @@ #include "file_system.h" -#include "assert.h" #include "byte_stream.h" #include "log.h" #include "string_util.h" diff --git a/src/common/gl/program.cpp b/src/common/gl/program.cpp index 7db77355..518a9551 100644 --- a/src/common/gl/program.cpp +++ b/src/common/gl/program.cpp @@ -1,5 +1,4 @@ #include "program.h" -#include "../assert.h" #include "../log.h" #include "../string_util.h" #include diff --git a/src/common/gl/stream_buffer.cpp b/src/common/gl/stream_buffer.cpp index 79a18112..806d07ce 100644 --- a/src/common/gl/stream_buffer.cpp +++ b/src/common/gl/stream_buffer.cpp @@ -1,6 +1,5 @@ #include "stream_buffer.h" #include "../align.h" -#include "../assert.h" #include #include diff --git a/src/common/image.h b/src/common/image.h index 7837dc71..c6c19976 100644 --- a/src/common/image.h +++ b/src/common/image.h @@ -1,5 +1,4 @@ #pragma once -#include "assert.h" #include "types.h" #include #include diff --git a/src/common/jit_code_buffer.cpp b/src/common/jit_code_buffer.cpp index f2131acb..fbac751b 100644 --- a/src/common/jit_code_buffer.cpp +++ b/src/common/jit_code_buffer.cpp @@ -1,6 +1,5 @@ #include "jit_code_buffer.h" #include "align.h" -#include "assert.h" #include "platform.h" #include diff --git a/src/common/log.cpp b/src/common/log.cpp index 1ed8bc5d..f0f96d32 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -1,5 +1,4 @@ #include "log.h" -#include "assert.h" #include "string.h" #include "timer.h" #include diff --git a/src/common/memory_arena.cpp b/src/common/memory_arena.cpp index e6ee859b..08413339 100644 --- a/src/common/memory_arena.cpp +++ b/src/common/memory_arena.cpp @@ -1,5 +1,4 @@ #include "memory_arena.h" -#include "common/assert.h" #include "common/log.h" #include "common/string_util.h" Log_SetChannel(Common::MemoryArena); diff --git a/src/common/progress_callback.cpp b/src/common/progress_callback.cpp index 1eceb627..81e21108 100644 --- a/src/common/progress_callback.cpp +++ b/src/common/progress_callback.cpp @@ -1,5 +1,4 @@ #include "progress_callback.h" -#include "assert.h" #include "byte_stream.h" #include "log.h" #include diff --git a/src/common/string.cpp b/src/common/string.cpp index 6a6f12f2..6e005f6b 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1,5 +1,4 @@ #include "string.h" -#include "assert.h" #include #include #include diff --git a/src/common/vulkan/builders.cpp b/src/common/vulkan/builders.cpp index 839a44cb..936f9bb2 100644 --- a/src/common/vulkan/builders.cpp +++ b/src/common/vulkan/builders.cpp @@ -1,5 +1,4 @@ #include "builders.h" -#include "../assert.h" #include "util.h" namespace Vulkan { diff --git a/src/common/vulkan/context.cpp b/src/common/vulkan/context.cpp index 5cc632d7..6d9c6e46 100644 --- a/src/common/vulkan/context.cpp +++ b/src/common/vulkan/context.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "context.h" -#include "../assert.h" #include "../log.h" #include "../string_util.h" #include "../window_info.h" diff --git a/src/common/vulkan/shader_cache.cpp b/src/common/vulkan/shader_cache.cpp index c2df6b05..e5268263 100644 --- a/src/common/vulkan/shader_cache.cpp +++ b/src/common/vulkan/shader_cache.cpp @@ -1,5 +1,4 @@ #include "shader_cache.h" -#include "../assert.h" #include "../file_system.h" #include "../log.h" #include "../md5_digest.h" diff --git a/src/common/vulkan/shader_compiler.cpp b/src/common/vulkan/shader_compiler.cpp index e87bec6a..0121d3e5 100644 --- a/src/common/vulkan/shader_compiler.cpp +++ b/src/common/vulkan/shader_compiler.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "shader_compiler.h" -#include "../assert.h" #include "../log.h" #include "../string_util.h" #include "util.h" diff --git a/src/common/vulkan/staging_buffer.cpp b/src/common/vulkan/staging_buffer.cpp index f10f7d05..62747314 100644 --- a/src/common/vulkan/staging_buffer.cpp +++ b/src/common/vulkan/staging_buffer.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "staging_buffer.h" -#include "../assert.h" #include "context.h" #include "util.h" diff --git a/src/common/vulkan/staging_texture.cpp b/src/common/vulkan/staging_texture.cpp index 3237bc1e..11e65bbb 100644 --- a/src/common/vulkan/staging_texture.cpp +++ b/src/common/vulkan/staging_texture.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "staging_texture.h" -#include "../assert.h" #include "context.h" #include "util.h" diff --git a/src/common/vulkan/stream_buffer.cpp b/src/common/vulkan/stream_buffer.cpp index 3352dc6c..80d4b88f 100644 --- a/src/common/vulkan/stream_buffer.cpp +++ b/src/common/vulkan/stream_buffer.cpp @@ -5,7 +5,6 @@ #include "stream_buffer.h" #include "../align.h" -#include "../assert.h" #include "../log.h" #include "context.h" #include "util.h" diff --git a/src/common/vulkan/texture.cpp b/src/common/vulkan/texture.cpp index fae211fb..a4419a3f 100644 --- a/src/common/vulkan/texture.cpp +++ b/src/common/vulkan/texture.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "texture.h" -#include "../assert.h" #include "context.h" #include "util.h" #include diff --git a/src/common/vulkan/util.cpp b/src/common/vulkan/util.cpp index 8739fca0..8479af82 100644 --- a/src/common/vulkan/util.cpp +++ b/src/common/vulkan/util.cpp @@ -4,7 +4,6 @@ // Refer to the LICENSE file included. #include "util.h" -#include "../assert.h" #include "../log.h" #include "../string_util.h" #include "context.h" diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp index ef3576c9..defb39bf 100644 --- a/src/core/analog_controller.cpp +++ b/src/core/analog_controller.cpp @@ -1,12 +1,10 @@ #include "analog_controller.h" -#include "common/log.h" #include "common/state_wrapper.h" #include "common/string_util.h" #include "host_interface.h" #include "settings.h" #include "system.h" #include -Log_SetChannel(AnalogController); AnalogController::AnalogController(u32 index) : m_index(index) { @@ -219,7 +217,6 @@ void AnalogController::SetAnalogMode(bool enabled) if (m_analog_mode == enabled) return; - Log_InfoPrintf("Controller %u switched to %s mode.", m_index + 1u, enabled ? "analog" : "digital"); g_host_interface->AddFormattedOSDMessage( 5.0f, enabled ? g_host_interface->TranslateString("AnalogController", "Controller %u switched to analog mode.") : @@ -394,9 +391,6 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out) } else { - if (m_configuration_mode) - Log_ErrorPrintf("Unimplemented config mode command 0x%02X", data_in); - *data_out = 0xFF; return false; } @@ -616,31 +610,31 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out) break; case Command::GetSetRumble: - { - int rumble_index = m_command_step - 2; - if (rumble_index >= 0) { - m_tx_buffer[m_command_step] = m_rumble_config[rumble_index]; - m_rumble_config[rumble_index] = data_in; + int rumble_index = m_command_step - 2; + if (rumble_index >= 0) + { + m_tx_buffer[m_command_step] = m_rumble_config[rumble_index]; + m_rumble_config[rumble_index] = data_in; - if (data_in == 0x00) - m_rumble_config_small_motor_index = rumble_index; - else if (data_in == 0x01) - m_rumble_config_large_motor_index = rumble_index; + if (data_in == 0x00) + m_rumble_config_small_motor_index = rumble_index; + else if (data_in == 0x01) + m_rumble_config_large_motor_index = rumble_index; + } + + if (m_command_step == 7) + { + if (m_rumble_config_large_motor_index == -1) + SetMotorState(LargeMotor, 0); + + if (m_rumble_config_small_motor_index == -1) + SetMotorState(SmallMotor, 0); + } } - - if (m_command_step == 7) - { - if (m_rumble_config_large_motor_index == -1) - SetMotorState(LargeMotor, 0); - - if (m_rumble_config_small_motor_index == -1) - SetMotorState(SmallMotor, 0); - } - } - break; - - DefaultCaseIsUnreachable(); + break; + default: + break; } *data_out = m_tx_buffer[m_command_step]; diff --git a/src/core/bios.cpp b/src/core/bios.cpp index d4c5f78c..71144c13 100644 --- a/src/core/bios.cpp +++ b/src/core/bios.cpp @@ -1,5 +1,4 @@ #include "bios.h" -#include "common/assert.h" #include "common/file_system.h" #include "common/md5_digest.h" #include diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 8f85f889..607978e1 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -1,7 +1,6 @@ #include "bus.h" #include "cdrom.h" #include "common/align.h" -#include "common/assert.h" #include "common/make_array.h" #include "common/state_wrapper.h" #include "cpu_code_cache.h" diff --git a/src/core/cdrom_async_reader.cpp b/src/core/cdrom_async_reader.cpp index a3d73287..b94b7869 100644 --- a/src/core/cdrom_async_reader.cpp +++ b/src/core/cdrom_async_reader.cpp @@ -1,5 +1,4 @@ #include "cdrom_async_reader.h" -#include "common/assert.h" #include "common/log.h" #include "common/timer.h" Log_SetChannel(CDROMAsyncReader); diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp index 88ba3dd1..522fe589 100644 --- a/src/core/cpu_code_cache.cpp +++ b/src/core/cpu_code_cache.cpp @@ -1,6 +1,5 @@ #include "cpu_code_cache.h" #include "bus.h" -#include "common/assert.h" #include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" diff --git a/src/core/cpu_recompiler_code_generator_x64.cpp b/src/core/cpu_recompiler_code_generator_x64.cpp index 44525536..c03be21c 100644 --- a/src/core/cpu_recompiler_code_generator_x64.cpp +++ b/src/core/cpu_recompiler_code_generator_x64.cpp @@ -1,5 +1,4 @@ #include "common/align.h" -#include "common/assert.h" #include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" diff --git a/src/core/cpu_recompiler_register_cache.h b/src/core/cpu_recompiler_register_cache.h index 3d328b54..33bb201f 100644 --- a/src/core/cpu_recompiler_register_cache.h +++ b/src/core/cpu_recompiler_register_cache.h @@ -1,5 +1,4 @@ #pragma once -#include "common/assert.h" #include "cpu_recompiler_types.h" #include "cpu_types.h" diff --git a/src/core/cpu_types.cpp b/src/core/cpu_types.cpp index 69f13818..2a18edc0 100644 --- a/src/core/cpu_types.cpp +++ b/src/core/cpu_types.cpp @@ -1,5 +1,4 @@ #include "cpu_types.h" -#include "common/assert.h" #include namespace CPU { diff --git a/src/core/digital_controller.cpp b/src/core/digital_controller.cpp index 491f84b2..7cf81dee 100644 --- a/src/core/digital_controller.cpp +++ b/src/core/digital_controller.cpp @@ -1,5 +1,4 @@ #include "digital_controller.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "host_interface.h" #include "system.h" diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp index 74a47342..dd472049 100644 --- a/src/core/gpu_commands.cpp +++ b/src/core/gpu_commands.cpp @@ -1,4 +1,3 @@ -#include "common/assert.h" #include "common/string_util.h" #include "gpu.h" #include "interrupt_controller.h" diff --git a/src/core/gpu_hw.cpp b/src/core/gpu_hw.cpp index 052d8fdc..278251e6 100644 --- a/src/core/gpu_hw.cpp +++ b/src/core/gpu_hw.cpp @@ -1,6 +1,5 @@ #include "gpu_hw.h" #include "common/align.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "cpu_core.h" #include "gpu_sw_backend.h" diff --git a/src/core/gpu_hw_d3d11.cpp b/src/core/gpu_hw_d3d11.cpp index 0e414864..d64c89a3 100644 --- a/src/core/gpu_hw_d3d11.cpp +++ b/src/core/gpu_hw_d3d11.cpp @@ -1,5 +1,4 @@ #include "gpu_hw_d3d11.h" -#include "common/assert.h" #include "common/d3d11/shader_compiler.h" #include "common/log.h" #include "common/state_wrapper.h" diff --git a/src/core/gpu_hw_d3d12.cpp b/src/core/gpu_hw_d3d12.cpp index c665f2fa..f587082a 100644 --- a/src/core/gpu_hw_d3d12.cpp +++ b/src/core/gpu_hw_d3d12.cpp @@ -1,6 +1,5 @@ #include "gpu_hw_d3d12.h" #include "common/align.h" -#include "common/assert.h" #include "common/d3d11/shader_compiler.h" #include "common/d3d12/context.h" #include "common/d3d12/descriptor_heap_manager.h" diff --git a/src/core/gpu_hw_opengl.cpp b/src/core/gpu_hw_opengl.cpp index 95f2bc0e..e45b188f 100644 --- a/src/core/gpu_hw_opengl.cpp +++ b/src/core/gpu_hw_opengl.cpp @@ -1,5 +1,4 @@ #include "gpu_hw_opengl.h" -#include "common/assert.h" #include "common/log.h" #include "common/state_wrapper.h" #include "common/timer.h" diff --git a/src/core/gpu_hw_shadergen.cpp b/src/core/gpu_hw_shadergen.cpp index aaebb628..532e1fe6 100644 --- a/src/core/gpu_hw_shadergen.cpp +++ b/src/core/gpu_hw_shadergen.cpp @@ -1,5 +1,4 @@ #include "gpu_hw_shadergen.h" -#include "common/assert.h" #include #include diff --git a/src/core/gpu_hw_vulkan.cpp b/src/core/gpu_hw_vulkan.cpp index 74363765..63e95887 100644 --- a/src/core/gpu_hw_vulkan.cpp +++ b/src/core/gpu_hw_vulkan.cpp @@ -1,5 +1,4 @@ #include "gpu_hw_vulkan.h" -#include "common/assert.h" #include "common/log.h" #include "common/scope_guard.h" #include "common/state_wrapper.h" diff --git a/src/core/gpu_sw.cpp b/src/core/gpu_sw.cpp index 08c6f2b5..f3982e6d 100644 --- a/src/core/gpu_sw.cpp +++ b/src/core/gpu_sw.cpp @@ -1,6 +1,5 @@ #include "gpu_sw.h" #include "common/align.h" -#include "common/assert.h" #include "common/make_array.h" #include "common/platform.h" #include "host_display.h" diff --git a/src/core/gpu_sw_backend.cpp b/src/core/gpu_sw_backend.cpp index f6a50ea1..59bb391b 100644 --- a/src/core/gpu_sw_backend.cpp +++ b/src/core/gpu_sw_backend.cpp @@ -1,5 +1,4 @@ #include "gpu_sw_backend.h" -#include "common/assert.h" #include "gpu_sw_backend.h" #include "host_display.h" #include "system.h" diff --git a/src/core/gte.cpp b/src/core/gte.cpp index be60b195..68105318 100644 --- a/src/core/gte.cpp +++ b/src/core/gte.cpp @@ -1,5 +1,4 @@ #include "gte.h" -#include "common/assert.h" #include "common/bitutils.h" #include "common/state_wrapper.h" #include "cpu_core.h" diff --git a/src/core/host_display.cpp b/src/core/host_display.cpp index fed7cbd1..c8e7a061 100644 --- a/src/core/host_display.cpp +++ b/src/core/host_display.cpp @@ -1,6 +1,5 @@ #include "host_display.h" #include "common/align.h" -#include "common/assert.h" #include "common/string_util.h" #include "common/timer.h" #include "host_interface.h" diff --git a/src/core/multitap.cpp b/src/core/multitap.cpp index 26c9eac1..b0525c93 100644 --- a/src/core/multitap.cpp +++ b/src/core/multitap.cpp @@ -224,8 +224,8 @@ bool Multitap::Transfer(const u8 data_in, u8* data_out) } } break; - - DefaultCaseIsUnreachable(); + default: + break; } return ack; } diff --git a/src/core/namco_guncon.cpp b/src/core/namco_guncon.cpp index 5254f269..859b988f 100644 --- a/src/core/namco_guncon.cpp +++ b/src/core/namco_guncon.cpp @@ -1,5 +1,4 @@ #include "namco_guncon.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "gpu.h" #include "host_display.h" diff --git a/src/core/negcon.cpp b/src/core/negcon.cpp index 35d76ee6..3c115e0f 100644 --- a/src/core/negcon.cpp +++ b/src/core/negcon.cpp @@ -1,5 +1,4 @@ #include "negcon.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "host_interface.h" #include diff --git a/src/core/playstation_mouse.cpp b/src/core/playstation_mouse.cpp index 7a2d4bfc..ec3dcdff 100644 --- a/src/core/playstation_mouse.cpp +++ b/src/core/playstation_mouse.cpp @@ -1,5 +1,4 @@ #include "playstation_mouse.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "gpu.h" #include "host_display.h" diff --git a/src/core/psf_loader.cpp b/src/core/psf_loader.cpp index 26e80e88..178a5c1f 100644 --- a/src/core/psf_loader.cpp +++ b/src/core/psf_loader.cpp @@ -1,6 +1,5 @@ #include "psf_loader.h" #include "bios.h" -#include "common/assert.h" #include "common/file_system.h" #include "system.h" #include "zlib.h" diff --git a/src/core/shadergen.cpp b/src/core/shadergen.cpp index 8eb38100..af3f23d7 100644 --- a/src/core/shadergen.cpp +++ b/src/core/shadergen.cpp @@ -1,5 +1,4 @@ #include "shadergen.h" -#include "common/assert.h" #include #include #include diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp index a144bfd3..4468b418 100644 --- a/src/core/timing_event.cpp +++ b/src/core/timing_event.cpp @@ -1,5 +1,4 @@ #include "timing_event.h" -#include "common/assert.h" #include "common/state_wrapper.h" #include "cpu_core.h" #include "cpu_core_private.h" diff --git a/src/libretro/game_settings.cpp b/src/libretro/game_settings.cpp index 586b34d4..92094cee 100644 --- a/src/libretro/game_settings.cpp +++ b/src/libretro/game_settings.cpp @@ -1,5 +1,4 @@ #include "game_settings.h" -#include "common/assert.h" #include "common/log.h" #include "common/string.h" #include "common/string_util.h" diff --git a/src/libretro/libretro_audio_stream.cpp b/src/libretro/libretro_audio_stream.cpp index 39481cfb..8256d23b 100644 --- a/src/libretro/libretro_audio_stream.cpp +++ b/src/libretro/libretro_audio_stream.cpp @@ -1,5 +1,4 @@ #include "libretro_audio_stream.h" -#include "common/assert.h" #include "libretro_host_interface.h" #include #include diff --git a/src/libretro/libretro_d3d11_host_display.cpp b/src/libretro/libretro_d3d11_host_display.cpp index 301a7308..41ef13cd 100644 --- a/src/libretro/libretro_d3d11_host_display.cpp +++ b/src/libretro/libretro_d3d11_host_display.cpp @@ -1,6 +1,5 @@ #include "libretro_d3d11_host_display.h" #include "common/align.h" -#include "common/assert.h" #include "common/d3d11/shader_cache.h" #include "common/d3d11/shader_compiler.h" #include "common/log.h" diff --git a/src/libretro/libretro_host_display.cpp b/src/libretro/libretro_host_display.cpp index 029ff892..da29347d 100644 --- a/src/libretro/libretro_host_display.cpp +++ b/src/libretro/libretro_host_display.cpp @@ -1,6 +1,5 @@ #include "libretro_host_display.h" #include "common/align.h" -#include "common/assert.h" #include "libretro_host_interface.h" #include #include diff --git a/src/libretro/libretro_host_interface.cpp b/src/libretro/libretro_host_interface.cpp index 0f4095af..38cc80c9 100644 --- a/src/libretro/libretro_host_interface.cpp +++ b/src/libretro/libretro_host_interface.cpp @@ -1,5 +1,4 @@ #include "libretro_host_interface.h" -#include "common/assert.h" #include "common/byte_stream.h" #include "common/file_system.h" #include "common/log.h" diff --git a/src/libretro/libretro_opengl_host_display.cpp b/src/libretro/libretro_opengl_host_display.cpp index 63065616..eaef532a 100644 --- a/src/libretro/libretro_opengl_host_display.cpp +++ b/src/libretro/libretro_opengl_host_display.cpp @@ -1,6 +1,5 @@ #include "libretro_opengl_host_display.h" #include "common/align.h" -#include "common/assert.h" #include "common/log.h" #include "core/gpu.h" #include "libretro_host_interface.h" diff --git a/src/libretro/libretro_vulkan_host_display.cpp b/src/libretro/libretro_vulkan_host_display.cpp index 42bf8922..53f90308 100644 --- a/src/libretro/libretro_vulkan_host_display.cpp +++ b/src/libretro/libretro_vulkan_host_display.cpp @@ -1,6 +1,5 @@ #include "libretro_vulkan_host_display.h" #include "common/align.h" -#include "common/assert.h" #include "common/log.h" #include "common/vulkan/builders.h" #include "common/vulkan/context.h" diff --git a/src/libretro/main.cpp b/src/libretro/main.cpp index 1232d17b..23bddb2f 100644 --- a/src/libretro/main.cpp +++ b/src/libretro/main.cpp @@ -1,4 +1,3 @@ -#include "common/assert.h" #include "libretro_host_interface.h" #include "scmversion/scmversion.h"