From 6cfc61665d2b8f95b1c5380f4c9e14ca83bee00c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 13 Apr 2014 14:45:55 -0700 Subject: [PATCH] Switch to a bitmask instead. --- GPU/GLES/Framebuffer.cpp | 12 +++------- GPU/GLES/GLES_GPU.cpp | 48 ++++++++++----------------------------- GPU/GLES/TextureCache.cpp | 2 +- GPU/GPUState.h | 8 +++---- 4 files changed, 20 insertions(+), 50 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 514bddb5b9..8871eaf57f 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -755,9 +755,7 @@ void FramebufferManager::DoSetRenderFrameBuffer() { // None found? Create one. if (!vfb) { - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; vfb = new VirtualFramebuffer(); vfb->fbo = 0; vfb->fb_address = fb_address; @@ -861,9 +859,7 @@ void FramebufferManager::DoSetRenderFrameBuffer() { // Use it as a render target. DEBUG_LOG(SCEGE, "Switching render target to FBO for %08x: %i x %i x %i ", vfb->fb_address, vfb->width, vfb->height, vfb->format); vfb->usageFlags |= FB_USAGE_RENDERTARGET; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; vfb->last_frame_render = gpuStats.numFlips; frameLastFramebufUsed = gpuStats.numFlips; vfb->dirtyAfterDisplay = true; @@ -1195,9 +1191,7 @@ void FramebufferManager::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool s glEnable(GL_DITHER); } else { nvfb->usageFlags |= FB_USAGE_RENDERTARGET; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; nvfb->last_frame_render = gpuStats.numFlips; nvfb->dirtyAfterDisplay = true; diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index a5fad0603a..4c1842d646 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -906,9 +906,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_REGION1: case GE_CMD_REGION2: gstate_c.framebufChanged = true; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_CLIPENABLE: @@ -970,9 +968,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_SCISSOR1: case GE_CMD_SCISSOR2: gstate_c.framebufChanged = true; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; /// @@ -984,9 +980,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_FRAMEBUFWIDTH: case GE_CMD_FRAMEBUFPIXFORMAT: gstate_c.framebufChanged = true; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_TEXADDR0: @@ -1001,9 +995,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXADDR5: case GE_CMD_TEXADDR6: case GE_CMD_TEXADDR7: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_TEXBUFWIDTH0: @@ -1017,15 +1009,11 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXBUFWIDTH5: case GE_CMD_TEXBUFWIDTH6: case GE_CMD_TEXBUFWIDTH7: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_CLUTFORMAT: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; // This could be used to "dirty" textures with clut. break; @@ -1035,9 +1023,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { break; case GE_CMD_LOADCLUT: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; textureCache_.LoadClut(); // This could be used to "dirty" textures with clut. break; @@ -1080,9 +1066,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { gstate_c.curTextureHeight = gstate.getTextureHeight(0); shaderManager_->DirtyUniform(DIRTY_UVSCALEOFFSET); // We will need to reset the texture now. - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; } break; @@ -1093,9 +1077,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXSIZE5: case GE_CMD_TEXSIZE6: case GE_CMD_TEXSIZE7: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_ZBUFPTR: @@ -1216,9 +1198,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_VIEWPORTZ1: case GE_CMD_VIEWPORTZ2: gstate_c.framebufChanged = true; - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_LIGHTENABLE0: @@ -1292,9 +1272,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXMODE: case GE_CMD_TEXFILTER: case GE_CMD_TEXWRAP: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; ////////////////////////////////////////////////////////////////// @@ -1573,9 +1551,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { #endif case GE_CMD_TEXLEVEL: - if (gstate_c.textureChanged == TEXCHANGE_UNCHANGED) { - gstate_c.textureChanged = TEXCHANGE_PARAMSONLY; - } + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; ////////////////////////////////////////////////////////////////// diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 839140a99d..280fc628d7 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -923,7 +923,7 @@ void TextureCache::SetTexture(bool force) { bool doDelete = true; // If we only loaded a clut, or changed framebuf or something, we don't need to rehash the texture data. - if (gstate_c.textureChanged == TEXCHANGE_PARAMSONLY) { + if ((gstate_c.textureChanged & TEXCHANGE_UPDATED) == 0) { rehash = false; } diff --git a/GPU/GPUState.h b/GPU/GPUState.h index b2e4d723ce..7933a91c35 100644 --- a/GPU/GPUState.h +++ b/GPU/GPUState.h @@ -435,9 +435,9 @@ struct UVScale { }; enum TextureChangeReason { - TEXCHANGE_UNCHANGED, - TEXCHANGE_UPDATED, - TEXCHANGE_PARAMSONLY, + TEXCHANGE_UNCHANGED = 0x00, + TEXCHANGE_UPDATED = 0x01, + TEXCHANGE_PARAMSONLY = 0x02, }; struct GPUStateCache @@ -447,7 +447,7 @@ struct GPUStateCache u32 offsetAddr; - TextureChangeReason textureChanged; + u8 textureChanged; bool textureFullAlpha; bool vertexFullAlpha; bool framebufChanged;