diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:27:17 -0600 |
| commit | 7bdd8191dbbde1324d2848fc256be820bc437fa2 (patch) | |
| tree | b2f8e22e2f85264bb3d6fa9af826fc1653c1a5f5 /Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp | |
| parent | 00a25cdaf5379a5ea3879ad7743cce47c9f44d65 (diff) | |
| parent | 69137cff4c58fbdfcb2b67ad51d2d68cc8ca0cbc (diff) | |
Merge branch 'master' into android-new-control-input-overlay
Conflicts:
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp | 4 |
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" |