ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Settings: Fix incorrect UI for xBR texture filter

This commit is contained in:
Connor McLaughlin 2020-09-13 00:52:06 +10:00
parent 455ce05bd8
commit ccaff2e7cd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/gpu_hw_shadergen.cpp
View File

@ -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"( ss << R"(
CONSTANT int BLEND_NONE = 0; CONSTANT int BLEND_NONE = 0;

4
src/core/settings.cpp
View File

@ -452,10 +452,10 @@ const char* Settings::GetRendererDisplayName(GPURenderer renderer)
return s_gpu_renderer_display_names[static_cast<int>(renderer)]; return s_gpu_renderer_display_names[static_cast<int>(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 = static constexpr auto s_texture_filter_display_names =
make_array(TRANSLATABLE("GPUTextureFilter", "Nearest-Neighbor"), TRANSLATABLE("GPUTextureFilter", "Bilinear"), make_array(TRANSLATABLE("GPUTextureFilter", "Nearest-Neighbor"), TRANSLATABLE("GPUTextureFilter", "Bilinear"),
TRANSLATABLE("GPUTextureFilter", "JINC2"), TRANSLATABLE("GPUTextureFilter", "xBRZ")); TRANSLATABLE("GPUTextureFilter", "JINC2"), TRANSLATABLE("GPUTextureFilter", "xBR"));
std::optional<GPUTextureFilter> Settings::ParseTextureFilterName(const char* str) std::optional<GPUTextureFilter> Settings::ParseTextureFilterName(const char* str)
{ {

2
src/core/types.h
View File

@ -71,7 +71,7 @@ enum class GPUTextureFilter : u8
Nearest, Nearest,
Bilinear, Bilinear,
JINC2, JINC2,
xBRZ, xBR,
Count Count
}; };

2
src/duckstation-libretro/libretro_host_interface.cpp
View File

@ -475,7 +475,7 @@ static std::array<retro_core_option_definition, 32> s_option_definitions = {{
"Texture Filtering", "Texture Filtering",
"Smooths out the blockyness of magnified textures on 3D object by using bilinear filtering. Will have a " "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.", "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"}, "Nearest"},
{"duckstation_GPU.WidescreenHack", {"duckstation_GPU.WidescreenHack",
"Widescreen Hack", "Widescreen Hack",