diff --git a/src/common/window_info.h b/src/common/window_info.h index 413f637dc..3a4fd91c7 100644 --- a/src/common/window_info.h +++ b/src/common/window_info.h @@ -1,4 +1,5 @@ #pragma once +#include "types.h" // Contains the information required to create a graphics context in a window. struct WindowInfo diff --git a/src/core/host_display.h b/src/core/host_display.h index 687469d01..e23d0b9b9 100644 --- a/src/core/host_display.h +++ b/src/core/host_display.h @@ -24,6 +24,7 @@ public: { None, D3D11, + Vulkan, OpenGL, OpenGLES }; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 7d6103ae7..313df095d 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -313,16 +313,16 @@ const char* Settings::GetCPUExecutionModeDisplayName(CPUExecutionMode mode) return s_cpu_execution_mode_display_names[static_cast(mode)]; } -static std::array s_gpu_renderer_names = {{ +static std::array s_gpu_renderer_names = {{ #ifdef WIN32 "D3D11", #endif - "OpenGL", "Software"}}; -static std::array s_gpu_renderer_display_names = {{ + "Vulkan", "OpenGL", "Software"}}; +static std::array s_gpu_renderer_display_names = {{ #ifdef WIN32 "Hardware (D3D11)", #endif - "Hardware (OpenGL)", "Software"}}; + "Hardware (Vulkan)", "Hardware (OpenGL)", "Software"}}; std::optional Settings::ParseRendererName(const char* str) { diff --git a/src/core/types.h b/src/core/types.h index ca78133d5..d394acd22 100644 --- a/src/core/types.h +++ b/src/core/types.h @@ -53,6 +53,7 @@ enum class GPURenderer : u8 #ifdef WIN32 HardwareD3D11, #endif + HardwareVulkan, HardwareOpenGL, Software, Count