ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shader Compile fixes. Played SMS for two shines.

This commit is contained in:
Ryan Houdek 2011-12-07 22:47:13 -06:00 committed by Sonicadvance1
parent 3160da1289
commit 9064b76deb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -697,7 +697,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
// optional perspective divides // optional perspective divides
if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ) if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
{ {
WRITE(p, "if (uv%d.z)", i); WRITE(p, "if (uv%d.z != 0.0f)", i);
WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i); WRITE(p, " uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i);
} }

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

@ -125,8 +125,7 @@ void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
WRITE(p," in float2 uv0 : TEXCOORD0)\n"); WRITE(p," in float2 uv0 : TEXCOORD0)\n");
} }
WRITE(p," in float2 uv0 : TEXCOORD0)\n" WRITE(p, "{\n"
"{\n"
" float2 sampleUv;\n" " float2 sampleUv;\n"
" float2 uv1 = floor(uv0);\n"); " float2 uv1 = floor(uv0);\n");
@ -448,10 +447,9 @@ void WriteRGB565Encoder(char* p,API_TYPE ApiType)
WriteSampleColor(p, "rgb", "float3 texSample0",ApiType); WriteSampleColor(p, "rgb", "float3 texSample0",ApiType);
WriteIncrementSampleX(p,ApiType); WriteIncrementSampleX(p,ApiType);
WriteSampleColor(p, "rgb", "float3 texSample1",ApiType); WriteSampleColor(p, "rgb", "float3 texSample1",ApiType);
WRITE(p, " float2 texRs = float2(texSample0.r, texSample1.r);\n");
WRITE(p, " float2 texRs = {texSample0.r, texSample1.r};\n"); WRITE(p, " float2 texGs = float2(texSample0.g, texSample1.g);\n");
WRITE(p, " float2 texGs = {texSample0.g, texSample1.g};\n"); WRITE(p, " float2 texBs = float2(texSample0.b, texSample1.b);\n");
WRITE(p, " float2 texBs = {texSample0.b, texSample1.b};\n");
WriteToBitDepth(p, 6, "texGs", "float2 gInt"); WriteToBitDepth(p, 6, "texGs", "float2 gInt");
WRITE(p, " float2 gUpper = floor(gInt / 8.0f);\n"); WRITE(p, " float2 gUpper = floor(gInt / 8.0f);\n");