diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-01-18 12:33:00 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-01-18 12:33:00 +0100 |
| commit | 291b5febecdee943a630aaa884f25c5d4d6688d1 (patch) | |
| tree | 4982187b786b1d889676580f10ec2426757930a0 /src/common | |
| parent | ed0276582e85c60fb4f65a63d83cad1bdeb409e2 (diff) | |
[common] merge RenderBackend and ShaderBackend options (#3313)
first of all it makes UI a tad bit more simple and benefits the end user
second, it allows to add new backends a bit more easily
and also, there was a shader backend option in android... we don't use opengl in android
so may as well save ourselves the trouble, aye
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3313
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Reviewed-by: DraVee <dravee@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.cpp | 1 | ||||
| -rw-r--r-- | src/common/settings.h | 17 | ||||
| -rw-r--r-- | src/common/settings_enums.h | 3 |
3 files changed, 5 insertions, 16 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index b7c2d3c9a9..d6b17b2f73 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -56,7 +56,6 @@ SWITCHABLE(Region, true); SWITCHABLE(RendererBackend, true); SWITCHABLE(ScalingFilter, false); SWITCHABLE(SpirvOptimizeMode, true); -SWITCHABLE(ShaderBackend, true); SWITCHABLE(TimeZone, true); SETTING(VSyncMode, true); SWITCHABLE(bool, false); diff --git a/src/common/settings.h b/src/common/settings.h index 03a371cd1d..a942c90418 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -78,7 +78,6 @@ SWITCHABLE(Region, true); SWITCHABLE(RendererBackend, true); SWITCHABLE(ScalingFilter, false); SWITCHABLE(SpirvOptimizeMode, true); -SWITCHABLE(ShaderBackend, true); SWITCHABLE(TimeZone, true); SETTING(VSyncMode, true); SWITCHABLE(bool, false); @@ -313,20 +312,12 @@ struct Values { // Renderer SwitchableSetting<RendererBackend, true> renderer_backend{linkage, #if defined(__sun__) || defined(__managarm__) - RendererBackend::OpenGL, + RendererBackend::OpenGL_GLSL, #else - RendererBackend::Vulkan, + RendererBackend::Vulkan, #endif - "backend", Category::Renderer}; - SwitchableSetting<ShaderBackend, true> shader_backend{linkage, -#if defined(__sun__) || defined(__managarm__) - ShaderBackend::Glsl, -#else - ShaderBackend::SpirV, -#endif - "shader_backend", Category::Renderer, Specialization::RuntimeList}; - SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, - Specialization::RuntimeList}; + "backend", Category::Renderer}; + SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, Specialization::RuntimeList}; // Graphics Settings ResolutionScalingInfo resolution_info{}; diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index be0c95906d..7d8d3f40d4 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -131,8 +131,7 @@ ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous); ENUM(AstcRecompression, Uncompressed, Bc1, Bc3); ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed); ENUM(VramUsageMode, Conservative, Aggressive); -ENUM(RendererBackend, OpenGL, Vulkan, Null); -ENUM(ShaderBackend, Glsl, Glasm, SpirV); +ENUM(RendererBackend, OpenGL_GLSL, Vulkan, Null, OpenGL_GLASM, OpenGL_SPIRV); ENUM(GpuAccuracy, Low, Medium, High); ENUM(DmaAccuracy, Default, Unsafe, Safe); ENUM(CpuBackend, Dynarmic, Nce); |