From 98fa5006fdeb43b118b6b64cc796f96b18b3960b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 16 Mar 2013 18:52:49 -0500 Subject: [PATCH] Fix some warnings. --- Source/Core/Core/Src/HW/GPFifo.cpp | 2 +- Source/Core/VideoCommon/Src/Fifo.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 63fff83db6..a7f7bd967b 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -102,7 +102,7 @@ void STACKALIGN CheckGatherPipe() { // Log only stores, fp stores and ps stores, filtering out other instructions arrived via optimizeGatherPipe int type = GetOpInfo(Memory::ReadUnchecked_U32(PC))->type; - if (type == OPTYPE_STORE || type == OPTYPE_STOREFP || (type == OPTYPE_PS && GetOpInfo(Memory::ReadUnchecked_U32(PC))->opname=="psq_st")) + if (type == OPTYPE_STORE || type == OPTYPE_STOREFP || (type == OPTYPE_PS && !strcmp(GetOpInfo(Memory::ReadUnchecked_U32(PC))->opname, "psq_st"))) { jit->js.fifoWriteAddresses.insert(PC); diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index b434dc3ca4..74b3de6d23 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -244,7 +244,7 @@ void RunGpu() FPURoundMode::SaveSIMDState(); FPURoundMode::LoadDefaultSIMDState(); ReadDataFromFifo(uData, 32); - u32 count = OpcodeDecoder_Run(g_bSkipCurrentFrame); + OpcodeDecoder_Run(g_bSkipCurrentFrame); FPURoundMode::LoadSIMDState(); //DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base"); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 419e7d5a43..9b4fdfbb0f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -63,7 +63,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line); #define GL_REPORT_FBO_ERROR() OpenGL_ReportFBOError(__FUNCTION__, __FILE__, __LINE__) #define GL_REPORT_PROGRAM_ERROR() OpenGL_ReportARBProgramError() #else -#define GL_REPORT_ERROR() GL_NO_ERROR +__forceinline GLenum GL_REPORT_ERROR() { return GL_NO_ERROR; } #define GL_REPORT_ERRORD() (void)GL_NO_ERROR #define GL_REPORT_FBO_ERROR() (void)true #define GL_REPORT_PROGRAM_ERROR() (void)0