Permalink
Browse files

ConfigManager: Convert GPUDeterminismMode into an enum class

Makes the values strongly-typed and gets more identifiers out of the
global namespace.

We are forced to use anything that is not "None" to mean none, because
X11 is garbage in that it has:

\#define None 0L

Because clearly no one else will ever want to use that identifier for
anything in their own code (and is why you should prefix literally
any and all preprocessor macros you expose to library users in public
headers).
  • Loading branch information...
lioncash committed Jun 15, 2018
1 parent bd85d63 commit de9c5fd375dcc56bdce817b0bdefadb9f2bdac94
Showing with 13 additions and 13 deletions.
  1. +4 −4 Source/Core/Core/BootManager.cpp
  2. +6 −6 Source/Core/Core/ConfigManager.h
  3. +3 −3 Source/Core/VideoCommon/Fifo.cpp
@@ -203,14 +203,14 @@ static ConfigCache config_cache;
static GPUDeterminismMode ParseGPUDeterminismMode(const std::string& mode)
{
if (mode == "auto")
return GPU_DETERMINISM_AUTO;
return GPUDeterminismMode::Auto;
if (mode == "none")
return GPU_DETERMINISM_NONE;
return GPUDeterminismMode::Disabled;
if (mode == "fake-completion")
return GPU_DETERMINISM_FAKE_COMPLETION;
return GPUDeterminismMode::FakeCompletion;
NOTICE_LOG(BOOT, "Unknown GPU determinism mode %s", mode.c_str());
return GPU_DETERMINISM_AUTO;
return GPUDeterminismMode::Auto;
}
// Boot the ISO or file
@@ -37,6 +37,8 @@ namespace PowerPC
enum class CPUCore;
} // namespace PowerPC
struct BootParameters;
// DSP Backend Types
#define BACKEND_NULLSOUND _trans("No Audio Output")
#define BACKEND_ALSA "ALSA"
@@ -47,17 +49,15 @@ enum class CPUCore;
#define BACKEND_OPENSLES "OpenSLES"
#define BACKEND_WASAPI "WASAPI (Exclusive Mode)"
enum GPUDeterminismMode
enum class GPUDeterminismMode
{
GPU_DETERMINISM_AUTO,
GPU_DETERMINISM_NONE,
Auto,
Disabled,
// This is currently the only mode. There will probably be at least
// one more at some point.
GPU_DETERMINISM_FAKE_COMPLETION,
FakeCompletion,
};
struct BootParameters;
struct SConfig
{
// Wii Devices
@@ -498,13 +498,13 @@ void UpdateWantDeterminism(bool want)
bool gpu_thread = false;
switch (param.m_GPUDeterminismMode)
{
case GPU_DETERMINISM_AUTO:
case GPUDeterminismMode::Auto:
gpu_thread = want;
break;
case GPU_DETERMINISM_NONE:
case GPUDeterminismMode::Disabled:
gpu_thread = false;
break;
case GPU_DETERMINISM_FAKE_COMPLETION:
case GPUDeterminismMode::FakeCompletion:
gpu_thread = true;
break;
}

0 comments on commit de9c5fd

Please sign in to comment.