Browse Source

fix mispell

Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/2534/head
lizzie 6 months ago
committed by crueter
parent
commit
5d20372014
  1. 2
      src/common/settings_enums.h
  2. 2
      src/qt_common/shared_translation.cpp
  3. 4
      src/qt_common/shared_translation.h
  4. 2
      src/video_core/host_shaders/CMakeLists.txt
  5. 0
      src/video_core/host_shaders/present_lanczos.frag
  6. 4
      src/video_core/renderer_opengl/gl_blit_screen.cpp
  7. 3
      src/video_core/renderer_opengl/present/filters.cpp
  8. 2
      src/video_core/renderer_opengl/present/filters.h
  9. 4
      src/video_core/renderer_vulkan/present/filters.cpp
  10. 2
      src/video_core/renderer_vulkan/present/filters.h
  11. 4
      src/video_core/renderer_vulkan/vk_blit_screen.cpp

2
src/common/settings_enums.h

@ -166,7 +166,7 @@ ENUM(ResolutionSetup,
Res7X, Res7X,
Res8X); Res8X);
ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczo, ScaleForce, Fsr, Area, MaxEnum);
ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, MaxEnum);
ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum); ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);

2
src/qt_common/shared_translation.cpp

@ -573,7 +573,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent)
PAIR(ScalingFilter, Bilinear, tr("Bilinear")), PAIR(ScalingFilter, Bilinear, tr("Bilinear")),
PAIR(ScalingFilter, Bicubic, tr("Bicubic")), PAIR(ScalingFilter, Bicubic, tr("Bicubic")),
PAIR(ScalingFilter, Gaussian, tr("Gaussian")), PAIR(ScalingFilter, Gaussian, tr("Gaussian")),
PAIR(ScalingFilter, Lanczo, tr("Lanczo")),
PAIR(ScalingFilter, Lanczos, tr("Lanczos")),
PAIR(ScalingFilter, ScaleForce, tr("ScaleForce")), PAIR(ScalingFilter, ScaleForce, tr("ScaleForce")),
PAIR(ScalingFilter, Fsr, tr("AMD FidelityFX™️ Super Resolution")), PAIR(ScalingFilter, Fsr, tr("AMD FidelityFX™️ Super Resolution")),
PAIR(ScalingFilter, Area, tr("Area")), PAIR(ScalingFilter, Area, tr("Area")),

4
src/qt_common/shared_translation.h

@ -40,8 +40,8 @@ static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map
{Settings::ScalingFilter::Bicubic, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bicubic"))}, {Settings::ScalingFilter::Bicubic, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bicubic"))},
{Settings::ScalingFilter::Gaussian, {Settings::ScalingFilter::Gaussian,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Gaussian"))}, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Gaussian"))},
{Settings::ScalingFilter::Lanczo,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Lanczo"))},
{Settings::ScalingFilter::Lanczos,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Lanczos"))},
{Settings::ScalingFilter::ScaleForce, {Settings::ScalingFilter::ScaleForce,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "ScaleForce"))}, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "ScaleForce"))},
{Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))}, {Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))},

2
src/video_core/host_shaders/CMakeLists.txt

@ -45,7 +45,7 @@ set(SHADER_FILES
present_area.frag present_area.frag
present_bicubic.frag present_bicubic.frag
present_gaussian.frag present_gaussian.frag
present_lanczo.frag
present_lanczos.frag
queries_prefix_scan_sum.comp queries_prefix_scan_sum.comp
queries_prefix_scan_sum_nosubgroups.comp queries_prefix_scan_sum_nosubgroups.comp
resolve_conditional_render.comp resolve_conditional_render.comp

0
src/video_core/host_shaders/present_lanczo.frag → src/video_core/host_shaders/present_lanczos.frag

4
src/video_core/renderer_opengl/gl_blit_screen.cpp

@ -89,8 +89,8 @@ void BlitScreen::CreateWindowAdapt() {
case Settings::ScalingFilter::Gaussian: case Settings::ScalingFilter::Gaussian:
window_adapt = MakeGaussian(device); window_adapt = MakeGaussian(device);
break; break;
case Settings::ScalingFilter::Lanczo:
window_adapt = MakeLanczo(device);
case Settings::ScalingFilter::Lanczos:
window_adapt = MakeLanczos(device);
break; break;
case Settings::ScalingFilter::ScaleForce: case Settings::ScalingFilter::ScaleForce:
window_adapt = MakeScaleForce(device); window_adapt = MakeScaleForce(device);

3
src/video_core/renderer_opengl/present/filters.cpp

@ -12,6 +12,7 @@
#include "video_core/host_shaders/present_area_frag.h" #include "video_core/host_shaders/present_area_frag.h"
#include "video_core/host_shaders/present_bicubic_frag.h" #include "video_core/host_shaders/present_bicubic_frag.h"
#include "video_core/host_shaders/present_gaussian_frag.h" #include "video_core/host_shaders/present_gaussian_frag.h"
#include "video_core/host_shaders/present_lanczos_frag.h"
#include "video_core/renderer_opengl/present/filters.h" #include "video_core/renderer_opengl/present/filters.h"
#include "video_core/renderer_opengl/present/util.h" #include "video_core/renderer_opengl/present/util.h"
@ -37,7 +38,7 @@ std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device) {
HostShaders::PRESENT_GAUSSIAN_FRAG); HostShaders::PRESENT_GAUSSIAN_FRAG);
} }
std::unique_ptr<WindowAdaptPass> MakeLanczo(const Device& device) {
std::unique_ptr<WindowAdaptPass> MakeLanczos(const Device& device) {
return std::make_unique<WindowAdaptPass>(device, CreateBilinearSampler(), return std::make_unique<WindowAdaptPass>(device, CreateBilinearSampler(),
HostShaders::PRESENT_LANCZO_FRAG); HostShaders::PRESENT_LANCZO_FRAG);
} }

2
src/video_core/renderer_opengl/present/filters.h

@ -18,7 +18,7 @@ std::unique_ptr<WindowAdaptPass> MakeNearestNeighbor(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeBilinear(const Device& device); std::unique_ptr<WindowAdaptPass> MakeBilinear(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeBicubic(const Device& device); std::unique_ptr<WindowAdaptPass> MakeBicubic(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device); std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeLanczo(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeLanczos(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeScaleForce(const Device& device); std::unique_ptr<WindowAdaptPass> MakeScaleForce(const Device& device);
std::unique_ptr<WindowAdaptPass> MakeArea(const Device& device); std::unique_ptr<WindowAdaptPass> MakeArea(const Device& device);

4
src/video_core/renderer_vulkan/present/filters.cpp

@ -12,7 +12,7 @@
#include "video_core/host_shaders/present_area_frag_spv.h" #include "video_core/host_shaders/present_area_frag_spv.h"
#include "video_core/host_shaders/present_bicubic_frag_spv.h" #include "video_core/host_shaders/present_bicubic_frag_spv.h"
#include "video_core/host_shaders/present_gaussian_frag_spv.h" #include "video_core/host_shaders/present_gaussian_frag_spv.h"
#include "video_core/host_shaders/present_lanczso_frag_spv.h"
#include "video_core/host_shaders/present_lanczos_frag_spv.h"
#include "video_core/host_shaders/vulkan_present_frag_spv.h" #include "video_core/host_shaders/vulkan_present_frag_spv.h"
#include "video_core/host_shaders/vulkan_present_scaleforce_fp16_frag_spv.h" #include "video_core/host_shaders/vulkan_present_scaleforce_fp16_frag_spv.h"
#include "video_core/host_shaders/vulkan_present_scaleforce_fp32_frag_spv.h" #include "video_core/host_shaders/vulkan_present_scaleforce_fp32_frag_spv.h"
@ -60,7 +60,7 @@ std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device, VkFormat fra
BuildShader(device, PRESENT_GAUSSIAN_FRAG_SPV)); BuildShader(device, PRESENT_GAUSSIAN_FRAG_SPV));
} }
std::unique_ptr<WindowAdaptPass> MakeLanczo(const Device& device, VkFormat frame_format) {
std::unique_ptr<WindowAdaptPass> MakeLanczos(const Device& device, VkFormat frame_format) {
return std::make_unique<WindowAdaptPass>(device, frame_format, CreateBilinearSampler(device), return std::make_unique<WindowAdaptPass>(device, frame_format, CreateBilinearSampler(device),
BuildShader(device, PRESENT_LANCZO_FRAG_SPV)); BuildShader(device, PRESENT_LANCZO_FRAG_SPV));
} }

2
src/video_core/renderer_vulkan/present/filters.h

@ -19,7 +19,7 @@ std::unique_ptr<WindowAdaptPass> MakeNearestNeighbor(const Device& device, VkFor
std::unique_ptr<WindowAdaptPass> MakeBilinear(const Device& device, VkFormat frame_format); std::unique_ptr<WindowAdaptPass> MakeBilinear(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeBicubic(const Device& device, VkFormat frame_format); std::unique_ptr<WindowAdaptPass> MakeBicubic(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device, VkFormat frame_format); std::unique_ptr<WindowAdaptPass> MakeGaussian(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeLanczo(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeLanczos(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeScaleForce(const Device& device, VkFormat frame_format); std::unique_ptr<WindowAdaptPass> MakeScaleForce(const Device& device, VkFormat frame_format);
std::unique_ptr<WindowAdaptPass> MakeArea(const Device& device, VkFormat frame_format); std::unique_ptr<WindowAdaptPass> MakeArea(const Device& device, VkFormat frame_format);

4
src/video_core/renderer_vulkan/vk_blit_screen.cpp

@ -46,8 +46,8 @@ void BlitScreen::SetWindowAdaptPass() {
case Settings::ScalingFilter::Gaussian: case Settings::ScalingFilter::Gaussian:
window_adapt = MakeGaussian(device, swapchain_view_format); window_adapt = MakeGaussian(device, swapchain_view_format);
break; break;
case Settings::ScalingFilter::Lanczo:
window_adapt = MakeLanczo(device, swapchain_view_format);
case Settings::ScalingFilter::Lanczos:
window_adapt = MakeLanczos(device, swapchain_view_format);
break; break;
case Settings::ScalingFilter::ScaleForce: case Settings::ScalingFilter::ScaleForce:
window_adapt = MakeScaleForce(device, swapchain_view_format); window_adapt = MakeScaleForce(device, swapchain_view_format);

Loading…
Cancel
Save