From 962db4bfc433afdce77fc30439ef4ab79c12d941 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sun, 12 Dec 2021 00:01:16 -0600 Subject: [PATCH] Resources: Move fxaa.fx to out of dx11 directory It was used by both DX and OGL --- bin/resources/shaders/{dx11 => common}/fxaa.fx | 0 pcsx2/GS/Renderers/DX11/GSDevice11.cpp | 2 +- pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename bin/resources/shaders/{dx11 => common}/fxaa.fx (100%) diff --git a/bin/resources/shaders/dx11/fxaa.fx b/bin/resources/shaders/common/fxaa.fx similarity index 100% rename from bin/resources/shaders/dx11/fxaa.fx rename to bin/resources/shaders/common/fxaa.fx diff --git a/pcsx2/GS/Renderers/DX11/GSDevice11.cpp b/pcsx2/GS/Renderers/DX11/GSDevice11.cpp index 75601e87c2..3dcfa7c7e3 100644 --- a/pcsx2/GS/Renderers/DX11/GSDevice11.cpp +++ b/pcsx2/GS/Renderers/DX11/GSDevice11.cpp @@ -969,7 +969,7 @@ void GSDevice11::DoFXAA(GSTexture* sTex, GSTexture* dTex) { try { - std::optional shader = Host::ReadResourceFileToString("shaders/dx11/fxaa.fx"); + std::optional shader = Host::ReadResourceFileToString("shaders/common/fxaa.fx"); if (shader.has_value()) { ShaderMacro sm(m_shader.model); diff --git a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp index e004e97cc3..de4a75c111 100644 --- a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp +++ b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp @@ -1611,7 +1611,7 @@ void GSDeviceOGL::DoFXAA(GSTexture* sTex, GSTexture* dTex) std::string fxaa_macro = "#define FXAA_GLSL_130 1\n"; fxaa_macro += "#extension GL_ARB_gpu_shader5 : enable\n"; - std::optional shader = Host::ReadResourceFileToString("shaders/opengl/fxaa.fx"); + std::optional shader = Host::ReadResourceFileToString("shaders/common/fxaa.fx"); if (!shader.has_value()) return;