From 32fb61816b95707d8adac423d997db72367da4ce Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 17 Aug 2014 21:22:00 -0500 Subject: [PATCH] Fixes PP-shaders on !Mesa targets. Seems mesa has a quirk where define THING(x) (#x) is the same as define THING(x) (##x) Didn't realize I messed it up since it just worked since I only tested on Mesa. --- Source/Core/VideoBackends/OGL/PostProcessing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/PostProcessing.cpp index 15c89a9443..10ccf9fba8 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.cpp +++ b/Source/Core/VideoBackends/OGL/PostProcessing.cpp @@ -265,8 +265,8 @@ void OpenGLPostProcessing::CreateHeader() "\tocol0 = color;\n" "}\n" - "#define GetOption(x) (option_#x)\n" - "#define OptionEnabled(x) (option_#x != 0)\n"; + "#define GetOption(x) (option_##x)\n" + "#define OptionEnabled(x) (option_##x != 0)\n"; } std::string OpenGLPostProcessing::LoadShaderOptions(const std::string& code)