diff options
| author | degasus <wickmarkus@web.de> | 2013-04-08 15:57:51 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-04-08 15:57:51 +0200 |
| commit | 702198f39b4eb71a068c20c9969bd86856fa85ae (patch) | |
| tree | bdee823a26505a752dc9c512cfb9bcfee0cbe90f /Source/Core/VideoCommon/Src/TextureConversionShader.cpp | |
| parent | ca8554e7d1d7c77b3c2a9ed8a7fb12de7096c67b (diff) | |
| parent | 4c40e70b8af839f84d7d9b8306116cabf3965cdb (diff) | |
Merge branch 'master' into primitive_restart
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
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 |