ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc: Collapse more niche log channels

This commit is contained in:
Stenzek 2024-12-01 23:14:24 +10:00
parent 9df59713da
commit e9848a6182
No known key found for this signature in database
14 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/log_channels.h
View File

@ -3,8 +3,6 @@
#define ENUMERATE_LOG_CHANNELS(X) \ #define ENUMERATE_LOG_CHANNELS(X) \
X(Achievements) \ X(Achievements) \
X(AnalogController) \
X(AnalogJoystick) \
X(AudioStream) \ X(AudioStream) \
X(AutoUpdaterDialog) \ X(AutoUpdaterDialog) \
X(BIOS) \ X(BIOS) \
@ -16,7 +14,7 @@
X(Cheats) \ X(Cheats) \
X(CodeCache) \ X(CodeCache) \
X(CompressHelpers) \ X(CompressHelpers) \
X(ControllerBindingWidget) \ X(Controller) \
X(CubebAudioStream) \ X(CubebAudioStream) \
X(CueParser) \ X(CueParser) \
X(DInputSource) \ X(DInputSource) \
@ -27,17 +25,12 @@
X(FullscreenUI) \ X(FullscreenUI) \
X(GDBProtocol) \ X(GDBProtocol) \
X(GPU) \ X(GPU) \
X(GPUBackend) \
X(GPUDevice) \ X(GPUDevice) \
X(GPUDump) \ X(GPUDump) \
X(GPUShaderCache) \
X(GPUTextureCache) \
X(GPU_HW) \
X(GPU_SW) \ X(GPU_SW) \
X(GPU_SW_Rasterizer) \ X(GPU_HW) \
X(GameDatabase) \ X(GameDatabase) \
X(GameList) \ X(GameList) \
X(GunCon) \
X(HTTPDownloader) \ X(HTTPDownloader) \
X(Host) \ X(Host) \
X(ImGuiFullscreen) \ X(ImGuiFullscreen) \
@ -45,19 +38,16 @@
X(Image) \ X(Image) \
X(InputManager) \ X(InputManager) \
X(InterruptController) \ X(InterruptController) \
X(Justifier) \
X(Log) \ X(Log) \
X(MDEC) \ X(MDEC) \
X(MediaCapture) \ X(MediaCapture) \
X(MemMap) \ X(MemMap) \
X(MemoryCard) \ X(MemoryCard) \
X(Multitap) \ X(Multitap) \
X(NeGconRumble) \
X(PCDrv) \ X(PCDrv) \
X(Pad) \ X(Pad) \
X(PerfMon) \ X(PerfMon) \
X(PlatformMisc) \ X(PlatformMisc) \
X(PlayStationMouse) \
X(PostProcessing) \ X(PostProcessing) \
X(ProgressCallback) \ X(ProgressCallback) \
X(ReShadeFXShader) \ X(ReShadeFXShader) \

2
src/core/analog_controller.cpp
View File

@ -20,7 +20,7 @@
#include <cmath> #include <cmath>
LOG_CHANNEL(AnalogController); LOG_CHANNEL(Controller);
AnalogController::AnalogController(u32 index) : Controller(index) AnalogController::AnalogController(u32 index) : Controller(index)
{ {

2
src/core/analog_joystick.cpp
View File

@ -16,7 +16,7 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/format.h" #include "fmt/format.h"
LOG_CHANNEL(AnalogJoystick); LOG_CHANNEL(Controller);
AnalogJoystick::AnalogJoystick(u32 index) : Controller(index) AnalogJoystick::AnalogJoystick(u32 index) : Controller(index)
{ {

2
src/core/gpu_backend.cpp
View File

@ -9,7 +9,7 @@
#include "common/log.h" #include "common/log.h"
#include "common/timer.h" #include "common/timer.h"
LOG_CHANNEL(GPUBackend); LOG_CHANNEL(GPU);
std::unique_ptr<GPUBackend> g_gpu_backend; std::unique_ptr<GPUBackend> g_gpu_backend;

2
src/core/gpu_hw_texture_cache.cpp
View File

@ -37,7 +37,7 @@
#include <numeric> #include <numeric>
#include <unordered_set> #include <unordered_set>
LOG_CHANNEL(GPUTextureCache); LOG_CHANNEL(GPU_HW);
#include "common/ryml_helpers.h" #include "common/ryml_helpers.h"

2
src/core/gpu_sw.cpp
View File

@ -16,7 +16,7 @@
#include <algorithm> #include <algorithm>
LOG_CHANNEL(GPU_SW); LOG_CHANNEL(GPU);
GPU_SW::GPU_SW() = default; GPU_SW::GPU_SW() = default;

2
src/core/gpu_sw_rasterizer.cpp
View File

@ -10,7 +10,7 @@
#include "common/log.h" #include "common/log.h"
#include "common/string_util.h" #include "common/string_util.h"
LOG_CHANNEL(GPU_SW_Rasterizer); LOG_CHANNEL(GPU_SW);
namespace GPU_SW_Rasterizer { namespace GPU_SW_Rasterizer {
constinit const DitherLUT g_dither_lut = []() constexpr { constinit const DitherLUT g_dither_lut = []() constexpr {

14
src/core/guncon.cpp
View File

@ -11,6 +11,7 @@
#include "util/state_wrapper.h" #include "util/state_wrapper.h"
#include "common/assert.h" #include "common/assert.h"
#include "common/log.h"
#include "common/path.h" #include "common/path.h"
#include "common/string_util.h" #include "common/string_util.h"
@ -18,10 +19,7 @@
#include <array> #include <array>
#if defined(_DEBUG) || defined(_DEVEL) LOG_CHANNEL(Controller);
#include "common/log.h"
LOG_CHANNEL(GunCon);
#endif
static constexpr std::array<u8, static_cast<size_t>(GunCon::Binding::ButtonCount)> s_button_indices = {{13, 3, 14}}; static constexpr std::array<u8, static_cast<size_t>(GunCon::Binding::ButtonCount)> s_button_indices = {{13, 3, 14}};
@ -264,13 +262,9 @@ std::unique_ptr<GunCon> GunCon::Create(u32 index)
static const Controller::ControllerBindingInfo s_binding_info[] = { static const Controller::ControllerBindingInfo s_binding_info[] = {
#define BUTTON(name, display_name, icon_name, binding, genb) \ #define BUTTON(name, display_name, icon_name, binding, genb) \
{ \ {name, display_name, icon_name, static_cast<u32>(binding), InputBindingInfo::Type::Button, genb}
name, display_name, icon_name, static_cast<u32>(binding), InputBindingInfo::Type::Button, genb \
}
#define HALFAXIS(name, display_name, icon_name, binding, genb) \ #define HALFAXIS(name, display_name, icon_name, binding, genb) \
{ \ {name, display_name, icon_name, static_cast<u32>(binding), InputBindingInfo::Type::HalfAxis, genb}
name, display_name, icon_name, static_cast<u32>(binding), InputBindingInfo::Type::HalfAxis, genb \
}
// clang-format off // clang-format off
{"Pointer", TRANSLATE_NOOP("GunCon", "Pointer/Aiming"), ICON_PF_MOUSE, static_cast<u32>(GunCon::Binding::ButtonCount), InputBindingInfo::Type::Pointer, GenericInputBinding::Unknown}, {"Pointer", TRANSLATE_NOOP("GunCon", "Pointer/Aiming"), ICON_PF_MOUSE, static_cast<u32>(GunCon::Binding::ButtonCount), InputBindingInfo::Type::Pointer, GenericInputBinding::Unknown},

2
src/core/jogcon.cpp
View File

@ -18,7 +18,7 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/format.h" #include "fmt/format.h"
LOG_CHANNEL(AnalogController); LOG_CHANNEL(Controller);
JogCon::JogCon(u32 index) : Controller(index) JogCon::JogCon(u32 index) : Controller(index)
{ {

2
src/core/justifier.cpp
View File

@ -19,7 +19,7 @@
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include <array> #include <array>
LOG_CHANNEL(Justifier); LOG_CHANNEL(Controller);
// #define CHECK_TIMING 1 // #define CHECK_TIMING 1
#ifdef CHECK_TIMING #ifdef CHECK_TIMING

2
src/core/negcon_rumble.cpp
View File

@ -23,7 +23,7 @@
#include <cmath> #include <cmath>
LOG_CHANNEL(NeGconRumble); LOG_CHANNEL(Controller);
// Mapping of Button to index of corresponding bit in m_button_state // Mapping of Button to index of corresponding bit in m_button_state
static constexpr std::array<u8, static_cast<size_t>(NeGconRumble::Button::Count)> s_button_indices = {3, 4, 5, 6, static constexpr std::array<u8, static_cast<size_t>(NeGconRumble::Button::Count)> s_button_indices = {3, 4, 5, 6,

2
src/core/playstation_mouse.cpp
View File

@ -16,7 +16,7 @@
#include <array> #include <array>
#include <cmath> #include <cmath>
LOG_CHANNEL(PlayStationMouse); LOG_CHANNEL(Controller);
static constexpr std::array<u8, static_cast<size_t>(PlayStationMouse::Binding::ButtonCount)> s_button_indices = { static constexpr std::array<u8, static_cast<size_t>(PlayStationMouse::Binding::ButtonCount)> s_button_indices = {
{11, 10}}; {11, 10}};

2
src/duckstation-qt/controllerbindingwidgets.cpp
View File

@ -39,7 +39,7 @@
#include <QtWidgets/QSpinBox> #include <QtWidgets/QSpinBox>
#include <algorithm> #include <algorithm>
LOG_CHANNEL(ControllerBindingWidget); LOG_CHANNEL(Host);
ControllerBindingWidget::ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port) ControllerBindingWidget::ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port)
: QWidget(parent), m_dialog(dialog), m_config_section(Controller::GetSettingsSection(port)), m_port_number(port) : QWidget(parent), m_dialog(dialog), m_config_section(Controller::GetSettingsSection(port)), m_port_number(port)

2
src/util/gpu_shader_cache.cpp
View File

@ -15,7 +15,7 @@
#include "compress_helpers.h" #include "compress_helpers.h"
LOG_CHANNEL(GPUShaderCache); LOG_CHANNEL(GPUDevice);
#pragma pack(push, 1) #pragma pack(push, 1)
struct CacheFileHeader struct CacheFileHeader