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/TextureCache.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/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Src/TextureCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp b/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp index eb2198ee7f..aa197c293c 100644 --- a/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp @@ -406,7 +406,7 @@ TextureCache::TextureCache() "uniform sampler2DRect samp9;\n" "uniform vec4 colmat[7];\n" "VARYIN vec2 uv0;\n" - "COLOROUT(ocol0)\n" + "out vec4 ocol0;\n" "\n" "void main(){\n" " vec4 texcol = texture2DRect(samp9, uv0);\n" @@ -418,7 +418,7 @@ TextureCache::TextureCache() "uniform sampler2DRect samp9;\n" "uniform vec4 colmat[5];\n" "VARYIN vec2 uv0;\n" - "COLOROUT(ocol0)\n" + "out vec4 ocol0;\n" "\n" "void main(){\n" " vec4 texcol = texture2DRect(samp9, uv0);\n" |