From d32383bd95ff24936a5a31be67dee609e6e10716 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 7 Jan 2020 18:54:39 +1000 Subject: [PATCH] Settings: Don't include D3D11 renderer on non-WIN32 platforms --- src/core/settings.cpp | 13 ++++++++++--- src/core/types.h | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 3a09eb4bc..1a4465491 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -181,9 +181,16 @@ const char* Settings::GetCPUExecutionModeDisplayName(CPUExecutionMode mode) return s_cpu_execution_mode_display_names[static_cast(mode)]; } -static std::array s_gpu_renderer_names = {{"D3D11", "OpenGL", "Software"}}; -static std::array s_gpu_renderer_display_names = { - {"Hardware (D3D11)", "Hardware (OpenGL)", "Software"}}; +static std::array s_gpu_renderer_names = {{ +#ifdef WIN32 + "D3D11", +#endif + "OpenGL", "Software"}}; +static std::array s_gpu_renderer_display_names = {{ +#ifdef WIN32 + "Hardware (D3D11)", +#endif + "Hardware (OpenGL)", "Software"}}; std::optional Settings::ParseRendererName(const char* str) { diff --git a/src/core/types.h b/src/core/types.h index 399e0b4c3..1008d8a46 100644 --- a/src/core/types.h +++ b/src/core/types.h @@ -41,7 +41,9 @@ enum class CPUExecutionMode : u8 enum class GPURenderer : u8 { +#ifdef WIN32 HardwareD3D11, +#endif HardwareOpenGL, Software, Count