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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -11,6 +11,7 @@
#include "util/state_wrapper.h"
#include "common/assert.h"
#include "common/log.h"
#include "common/path.h"
#include "common/string_util.h"
@ -18,10 +19,7 @@
#include <array>
#if defined(_DEBUG) || defined(_DEVEL)
#include "common/log.h"
LOG_CHANNEL(GunCon);
#endif
LOG_CHANNEL(Controller);
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[] = {
#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) \
{ \
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
{"Pointer", TRANSLATE_NOOP("GunCon", "Pointer/Aiming"), ICON_PF_MOUSE, static_cast<u32>(GunCon::Binding::ButtonCount), InputBindingInfo::Type::Pointer, GenericInputBinding::Unknown},

View File

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

View File

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

View File

@ -23,7 +23,7 @@
#include <cmath>
LOG_CHANNEL(NeGconRumble);
LOG_CHANNEL(Controller);
// 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,

View File

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

View File

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

View File

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