Fix a few minor warnings.

This commit is contained in:
Unknown W. Brackets 2014-06-19 00:47:58 -07:00
parent 413704f674
commit 5f4a0d8174
4 changed files with 6 additions and 7 deletions

View file

@ -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)
{

View file

@ -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;

View file

@ -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) {

View file

@ -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;
}