diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-04-11 19:55:36 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-04-11 19:55:36 +1200 |
| commit | 0c9d8d34e1307433e27435c7d2f84557fd563752 (patch) | |
| tree | 70bc214fe520abc14e64d1a78cafffe178ae239c /Source/Core/VideoCommon/Src/TextureConversionShader.cpp | |
| parent | 7784fa4c67cc8d2545f45694d83805e7e89cd583 (diff) | |
| parent | 3c87512180decf6b0aae9402a2179c73674ef5d8 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/CMakeLists.txt
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureConversionShader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureConversionShader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp index 5a81c9e7d5..314be94355 100644 --- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp +++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp @@ -105,8 +105,8 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType) if (ApiType == API_OPENGL) { - WRITE(p, " out float4 ocol0;\n"); - WRITE(p, " in float2 uv0;\n"); + WRITE(p, " COLOROUT(ocol0)\n"); + WRITE(p, " VARYIN float2 uv0;\n"); WRITE(p, "void main()\n"); } else @@ -187,7 +187,7 @@ void Write32BitSwizzler(char*& p, u32 format, API_TYPE ApiType) if (ApiType == API_OPENGL) { WRITE(p, " out float4 ocol0;\n"); - WRITE(p, " in float2 uv0;\n"); + WRITE(p, " VARYIN float2 uv0;\n"); WRITE(p, "void main()\n"); } else |