summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-09-01 19:48:45 +0000
committerhrydgard <hrydgard@gmail.com>2009-09-01 19:48:45 +0000
commit2599659022948fe3668b605ebaa3f59642e8f090 (patch)
tree3c8fc479ef9bb7b1254d6186775d80ca415795f1 /Source/Core/VideoCommon/Src/PixelShaderGen.cpp
parentb15320bc02680584a9178bca48030260870d8f80 (diff)
D3D: Fix bugs in the shader cache, fixes crashes on x64. added some debugging stuff (only active in debug builds). assorted code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4145 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/PixelShaderGen.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/PixelShaderGen.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index b158487d0b..0fc5e6edbf 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -398,7 +398,7 @@ const char *GeneratePixelShader(u32 texture_mask, bool dstAlphaEnable, bool HLSL
for (int i = 0; i < numStages; ++i)
{
if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
- nIndirectStagesUsed |= 1<<bpmem.tevind[i].bt;
+ nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
}
}
@@ -410,13 +410,14 @@ const char *GeneratePixelShader(u32 texture_mask, bool dstAlphaEnable, bool HLSL
else
WRITE(p, "uniform samplerRECT ");
bool bfirst = true;
- for (int i = 0; i < 8; ++i)
+ for (int i = 0; i < 8; ++i)
+ {
if (texture_mask & (1<<i))
{
WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i);
bfirst = false;
}
-
+ }
WRITE(p, ";\n");
}