From ccaff2e7cdeda2f260e2a99455bb7d99a9be3946 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 13 Sep 2020 00:52:06 +1000 Subject: [PATCH] Settings: Fix incorrect UI for xBR texture filter --- src/core/gpu_hw_shadergen.cpp | 2 +- src/core/settings.cpp | 4 ++-- src/core/types.h | 2 +- src/duckstation-libretro/libretro_host_interface.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/gpu_hw_shadergen.cpp b/src/core/gpu_hw_shadergen.cpp index 893efc60e..460478a13 100644 --- a/src/core/gpu_hw_shadergen.cpp +++ b/src/core/gpu_hw_shadergen.cpp @@ -768,7 +768,7 @@ void FilteredSampleFromVRAM(uint4 texpage, float2 coords, float4 uv_limits, } )"; } - else if (texture_filter == GPUTextureFilter::xBRZ) + else if (texture_filter == GPUTextureFilter::xBR) { ss << R"( CONSTANT int BLEND_NONE = 0; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 08f8517fb..4c354287a 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -452,10 +452,10 @@ const char* Settings::GetRendererDisplayName(GPURenderer renderer) return s_gpu_renderer_display_names[static_cast(renderer)]; } -static constexpr auto s_texture_filter_names = make_array("Nearest", "Bilinear", "JINC2", "xBRZ"); +static constexpr auto s_texture_filter_names = make_array("Nearest", "Bilinear", "JINC2", "xBR"); static constexpr auto s_texture_filter_display_names = make_array(TRANSLATABLE("GPUTextureFilter", "Nearest-Neighbor"), TRANSLATABLE("GPUTextureFilter", "Bilinear"), - TRANSLATABLE("GPUTextureFilter", "JINC2"), TRANSLATABLE("GPUTextureFilter", "xBRZ")); + TRANSLATABLE("GPUTextureFilter", "JINC2"), TRANSLATABLE("GPUTextureFilter", "xBR")); std::optional Settings::ParseTextureFilterName(const char* str) { diff --git a/src/core/types.h b/src/core/types.h index 5b1c3c9e8..c1a281064 100644 --- a/src/core/types.h +++ b/src/core/types.h @@ -71,7 +71,7 @@ enum class GPUTextureFilter : u8 Nearest, Bilinear, JINC2, - xBRZ, + xBR, Count }; diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp index b8a0ae0ed..f553bf2a7 100644 --- a/src/duckstation-libretro/libretro_host_interface.cpp +++ b/src/duckstation-libretro/libretro_host_interface.cpp @@ -475,7 +475,7 @@ static std::array s_option_definitions = {{ "Texture Filtering", "Smooths out the blockyness of magnified textures on 3D object by using bilinear filtering. Will have a " "greater effect on higher resolution scales. Only applies to the hardware renderers.", - {{"Nearest", "Nearest-Neighbor"}, {"Bilinear", "Bilinear"}, {"JINC2", "JINC2"}, {"xBRZ", "xBRZ"}}, + {{"Nearest", "Nearest-Neighbor"}, {"Bilinear", "Bilinear"}, {"JINC2", "JINC2"}, {"xBR", "xBR"}}, "Nearest"}, {"duckstation_GPU.WidescreenHack", "Widescreen Hack",