Permalink
Browse files

Merge pull request #7125 from lioncash/enum

ConfigManager: Convert GPUDeterminismMode into an enum class
  • Loading branch information...
JosJuice committed Jun 18, 2018
2 parents 29d51ff + de9c5fd commit 091efcc41d59dbe0e478ea96f891c1b47b99ddde
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 091efcc

Please sign in to comment.