summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@Gmail.com>2013-11-25 00:06:29 +0000
committerRyan Houdek <Sonicadvance1@Gmail.com>2013-11-25 00:06:29 +0000
commitda3eef1019fb9899cdde34d423ce19c4a093bf60 (patch)
treec7e44e0398bee688c3446cca064f1d7287ba65c5 /Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
parent2c09e8fc5a2bb6ea358d779ce523d44e1b7dcdce (diff)
Fix the issue with COLOROUT not being defined anymore. Fix a issue where Mali shader compiler is idiotic in finding an overload for the mix function.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
index 1530016336..1ce5e552a2 100644
--- a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
@@ -200,7 +200,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
char ps_rgba6_to_rgb8[] =
"uniform sampler2DRect samp9;\n"
- "COLOROUT(ocol0)\n"
+ "out vec4 ocol0;\n"
"void main()\n"
"{\n"
" ivec4 src6 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 63.f));\n"
@@ -214,7 +214,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
char ps_rgb8_to_rgba6[] =
"uniform sampler2DRect samp9;\n"
- "COLOROUT(ocol0)\n"
+ "out vec4 ocol0;\n"
"void main()\n"
"{\n"
" ivec4 src8 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 255.f));\n"