diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-02-24 03:38:36 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-02-24 03:38:36 +0000 |
| commit | 1d40b8a5ae2e64ed329f66e9da059cde9baf24fc (patch) | |
| tree | 1dc8c263a83789cac1a2a6999d1370438570f0cd /Source/Core/VideoCommon | |
| parent | 3cc5d8ce6f31ffa26f7eb3f8db9de68cca9721e2 (diff) | |
Systematically eliminating compiler warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5117 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 97eff04756..c7b8a48598 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -148,7 +148,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, u32 texturemask, u32 dstAlphaEnable) static void WriteStage(char *&p, int n, u32 texture_mask, u32 HLSL); static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, u32 texture_mask, u32 HLSL); -static void WriteAlphaCompare(char *&p, int num, int comp); +// static void WriteAlphaCompare(char *&p, int num, int comp); static bool WriteAlphaTest(char *&p, u32 HLSL); static void WriteFog(char *&p); @@ -926,7 +926,7 @@ static bool WriteAlphaTest(char *&p, u32 HLSL) int compindex = bpmem.alphaFunc.comp0 % 8; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table - WRITE(p, tevAlphaFunclogicTable[bpmem.alphaFunc.logic % 4]);//lookup the logic op + WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alphaFunc.logic % 4]);//lookup the logic op compindex = bpmem.alphaFunc.comp1 % 8; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table @@ -969,7 +969,7 @@ static void WriteFog(char *&p) if(bpmem.fog.c_proj_fsel.fsel > 3) { - WRITE(p, tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); + WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]); } else { |