diff --git a/src/core/settings.h b/src/core/settings.h index 320120035..abb00859a 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -6,7 +6,6 @@ #include "types.h" #include "util/audio_stream.h" -#include "util/gpu_types.h" #include "common/log.h" #include "common/settings_interface.h" @@ -19,6 +18,8 @@ #include #include +enum class RenderAPI : u32; + struct SettingInfo { enum class Type diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index a129830f8..f6a2cd5b9 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -28,7 +28,6 @@ add_library(util gpu_shader_cache.h gpu_texture.cpp gpu_texture.h - gpu_types.h host.cpp host.h http_downloader.cpp diff --git a/src/util/gpu_device.h b/src/util/gpu_device.h index a4d2aacf3..e76cf4528 100644 --- a/src/util/gpu_device.h +++ b/src/util/gpu_device.h @@ -5,7 +5,6 @@ #include "gpu_shader_cache.h" #include "gpu_texture.h" -#include "gpu_types.h" #include "window_info.h" #include "common/bitfield.h" @@ -26,6 +25,17 @@ class Error; +enum class RenderAPI : u32 +{ + None, + D3D11, + D3D12, + Vulkan, + OpenGL, + OpenGLES, + Metal +}; + class GPUSampler { public: diff --git a/src/util/gpu_types.h b/src/util/gpu_types.h deleted file mode 100644 index 988961a62..000000000 --- a/src/util/gpu_types.h +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) - -#pragma once - -enum class RenderAPI : u32 -{ - None, - D3D11, - D3D12, - Vulkan, - OpenGL, - OpenGLES, - Metal -}; diff --git a/src/util/util.vcxproj b/src/util/util.vcxproj index 9a23c5e5b..5fd5404ef 100644 --- a/src/util/util.vcxproj +++ b/src/util/util.vcxproj @@ -2,7 +2,6 @@ - diff --git a/src/util/util.vcxproj.filters b/src/util/util.vcxproj.filters index 54b5cef8a..5a8a32282 100644 --- a/src/util/util.vcxproj.filters +++ b/src/util/util.vcxproj.filters @@ -71,7 +71,6 @@ -