From dcf1ce7f014320917e8316cdc70a6ac7b08b99ce Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 19 Jun 2014 00:47:58 -0700 Subject: [PATCH] Fix a few minor warnings. --- Core/HLE/HLE.cpp | 2 +- GPU/GLES/Framebuffer.cpp | 2 +- GPU/GLES/StencilBuffer.cpp | 7 +++---- GPU/GLES/TextureCache.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index 3e68432aa9..4754531ebc 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -538,7 +538,7 @@ void CallSyscall(MIPSOpcode op) CallSyscallWithoutFlags(info); } else - ERROR_LOG_REPORT(HLE, "Unimplemented HLE function %s", info->name ? info->name : "(???)"); + ERROR_LOG_REPORT(HLE, "Unimplemented HLE function %s", info->name ? info->name : "(\?\?\?)"); if (g_Config.bShowDebugStats) { diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 043d202ec9..6fc83e0e90 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -2094,7 +2094,7 @@ bool FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size, bool const u32 vfb_size = FramebufferByteSize(vfb); const u32 vfb_bpp = vfb->format == GE_FORMAT_8888 ? 4 : 2; const u32 vfb_byteStride = vfb->fb_stride * vfb_bpp; - const u32 vfb_byteWidth = vfb->width * vfb_bpp; + const int vfb_byteWidth = vfb->width * vfb_bpp; if (dst >= vfb_address && (dst + size <= vfb_address + vfb_size || dst == vfb_address)) { const u32 offset = dst - vfb_address; diff --git a/GPU/GLES/StencilBuffer.cpp b/GPU/GLES/StencilBuffer.cpp index 0429f4b2a3..256ea7d620 100644 --- a/GPU/GLES/StencilBuffer.cpp +++ b/GPU/GLES/StencilBuffer.cpp @@ -50,10 +50,6 @@ static const char *stencil_vs = " gl_Position = a_position;\n" "}\n"; -static bool MaskedEqual(u32 addr1, u32 addr2) { - return (addr1 & 0x03FFFFFF) == (addr2 & 0x03FFFFFF); -} - bool FramebufferManager::NotifyStencilUpload(u32 addr, int size) { if (!MayIntersectFramebuffer(addr)) { return false; @@ -111,6 +107,9 @@ bool FramebufferManager::NotifyStencilUpload(u32 addr, int size) { case GE_FORMAT_8888: values = 256; break; + case GE_FORMAT_INVALID: + // Impossible. + break; } if (dstBuffer->fbo) { diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index b48a3f86e0..0db3d32b07 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -1083,7 +1083,7 @@ void TextureCache::SetTextureFramebuffer(TexCacheEntry *entry, VirtualFramebuffe gstate_c.flipTexture = true; gstate_c.curTextureXOffset = fbTexInfo_[entry->addr].xOffset; gstate_c.curTextureYOffset = fbTexInfo_[entry->addr].yOffset; - gstate_c.needShaderTexClamp = gstate_c.curTextureWidth != gstate.getTextureWidth(0) || gstate_c.curTextureHeight != gstate.getTextureHeight(0); + gstate_c.needShaderTexClamp = gstate_c.curTextureWidth != (u32)gstate.getTextureWidth(0) || gstate_c.curTextureHeight != (u32)gstate.getTextureHeight(0); if (gstate_c.curTextureXOffset != 0 || gstate_c.curTextureYOffset != 0) { gstate_c.needShaderTexClamp = true; }