Merge pull request #607 from Tilka/fix_warnings

Fix warnings unearthed by #579

3 files changed, 2 insertions, 29 deletions

diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
index a66dd5ee98..5e049e3b18 100644
--- a/Source/Core/VideoCommon/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -252,11 +252,6 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
 	}
 }
 
-static bool AllowIdleSkipping()
-{
-	return !SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || (!m_Control.PETokenEnable && !m_Control.PEFinishEnable);
-}
-
 void UpdateInterrupts()
 {
 	// check if there is a token-interrupt
diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp
index 10b8114c8d..ad4dd6f1f6 100644
--- a/Source/Core/VideoCommon/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/TextureConversionShader.cpp
@@ -349,30 +349,6 @@ static void WriteRGB5A3Encoder(char*& p,API_TYPE ApiType)
 	WriteEncoderEnd(p, ApiType);
 }
 
-static void WriteRGBA4443Encoder(char*& p,API_TYPE ApiType)
-{
-	WriteSwizzler(p, GX_TF_RGB5A3, ApiType);
-
-	WRITE(p, "  float4 texSample;\n");
-	WRITE(p, "  float4 color0;\n");
-	WRITE(p, "  float4 color1;\n");
-
-	WriteSampleColor(p, "rgba", "texSample", 0, ApiType);
-	WriteToBitDepth(p, 3, "texSample.a", "color0.b");
-	WriteToBitDepth(p, 4, "texSample.r", "color1.b");
-	WriteToBitDepth(p, 4, "texSample.g", "color0.g");
-	WriteToBitDepth(p, 4, "texSample.b", "color1.g");
-
-	WriteSampleColor(p, "rgba", "texSample", 1, ApiType);
-	WriteToBitDepth(p, 3, "texSample.a", "color0.r");
-	WriteToBitDepth(p, 4, "texSample.r", "color1.r");
-	WriteToBitDepth(p, 4, "texSample.g", "color0.a");
-	WriteToBitDepth(p, 4, "texSample.b", "color1.a");
-
-	WRITE(p, "  ocol0 = (color0 * 16.0 + color1) / 255.0;\n");
-	WriteEncoderEnd(p, ApiType);
-}
-
 static void WriteRGBA8Encoder(char*& p,API_TYPE ApiType)
 {
 	WriteSwizzler(p, GX_TF_RGBA8, ApiType);
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
index a0ec1bba05..245e5c6141 100644
--- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -560,6 +560,7 @@ static void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch)
 	}
 }
 
+#ifdef CHECK
 static void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
 {
 	// S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support)
@@ -602,6 +603,7 @@ static void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch)
 		dst += pitch;
 	}
 }
+#endif
 
 #if 0   // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8
 static void copyDXTBlock(u8* dst, const u8* src)