The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-18 18:58:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL: fix efb2ram for texture2D

Browse Source 
This was hacky as hell. Our efb2ram shader generator is just freaked out.
This commit is contained in:
degasus
2013-11-25 08:56:01 +01:00
parent b904d56036
commit 146e435009
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/Src/TextureConversionShader.cpp
View File

@ -81,7 +81,7 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
if (ApiType == API_OPENGL) if (ApiType == API_OPENGL)
{ {
WRITE(p, "#define samp0 samp9\n"); WRITE(p, "#define samp0 samp9\n");
WRITE(p, "uniform sampler2DRect samp0;\n"); WRITE(p, "uniform sampler2D samp0;\n");
WRITE(p, " out vec4 ocol0;\n"); WRITE(p, " out vec4 ocol0;\n");
WRITE(p, " VARYIN float2 uv0;\n"); WRITE(p, " VARYIN float2 uv0;\n");
@ -146,7 +146,7 @@ void Write32BitSwizzler(char*& p, u32 format, API_TYPE ApiType)
if (ApiType == API_OPENGL) if (ApiType == API_OPENGL)
{ {
WRITE(p, "#define samp0 samp9\n"); WRITE(p, "#define samp0 samp9\n");
WRITE(p, "uniform sampler2DRect samp0;\n"); WRITE(p, "uniform sampler2D samp0;\n");
WRITE(p, " out float4 ocol0;\n"); WRITE(p, " out float4 ocol0;\n");
WRITE(p, " VARYIN float2 uv0;\n"); WRITE(p, " VARYIN float2 uv0;\n");
@ -202,7 +202,7 @@ void WriteSampleColor(char*& p, const char* colorComp, const char* dest, API_TYP
if (ApiType == API_D3D) if (ApiType == API_D3D)
texSampleOpName = "tex0.Sample"; texSampleOpName = "tex0.Sample";
else // OGL else // OGL
texSampleOpName = "texture2DRect"; texSampleOpName = "texture";
// the increment of sampleUv.x is delayed, so we perform it here. see WriteIncrementSampleX. // the increment of sampleUv.x is delayed, so we perform it here. see WriteIncrementSampleX.
const char* texSampleIncrementUnit; const char* texSampleIncrementUnit;
@ -211,7 +211,7 @@ void WriteSampleColor(char*& p, const char* colorComp, const char* dest, API_TYP
else // OGL else // OGL
texSampleIncrementUnit = I_COLORS"[0].x"; texSampleIncrementUnit = I_COLORS"[0].x";
WRITE(p, " %s = %s(samp0, sampleUv + float2(%d.0 * (%s), 0.0)).%s;\n", WRITE(p, " %s = %s(samp0, (sampleUv + float2(%d.0 * (%s), 0.0)) / textureSize(samp0, 0)).%s;\n",
dest, texSampleOpName, s_incrementSampleXCount, texSampleIncrementUnit, colorComp); dest, texSampleOpName, s_incrementSampleXCount, texSampleIncrementUnit, colorComp);
} }