diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index b7698b8d52..d4a0bdf3f8 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -226,7 +226,7 @@ void __DisplayDoState(PointerWrap &p) { CoreTiming::RestoreRegisterEvent(afterFlipEvent, "AfterFlip", &hleAfterFlip); p.Do(gstate); - p.Do(gstate_c); + gstate_c.DoState(p); #ifndef _XBOX if (s < 2) { // This shouldn't have been savestated anyway, but it was. diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 04d5db5712..92a4bec3a0 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -428,7 +428,7 @@ void FramebufferManagerDX9::SetRenderFrameBuffer() { // None found? Create one. if (!vfb) { - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; vfb = new VirtualFramebufferDX9(); vfb->fbo = 0; vfb->fb_address = fb_address; @@ -512,7 +512,7 @@ void FramebufferManagerDX9::SetRenderFrameBuffer() { // 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; - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; vfb->last_frame_render = gpuStats.numFlips; frameLastFramebufUsed = gpuStats.numFlips; vfb->dirtyAfterDisplay = true; diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 59ee9b712c..724f543f43 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -520,7 +520,7 @@ void DIRECTX9_GPU::CopyDisplayToOutputInternal() { shaderManager_->EndFrame(); - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; } // Maybe should write this in ASM... @@ -737,7 +737,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_REGION2: if (diff) { gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; } break; @@ -751,7 +751,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_TEXTUREMAPENABLE: if (diff) - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; break; case GE_CMD_LIGHTINGENABLE: @@ -829,7 +829,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_FRAMEBUFPIXFORMAT: if (diff) { gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; } break; @@ -841,7 +841,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_TEXADDR5: case GE_CMD_TEXADDR6: case GE_CMD_TEXADDR7: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; shaderManager_->DirtyUniform(DIRTY_UVSCALEOFFSET); break; @@ -853,18 +853,18 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_TEXBUFWIDTH5: case GE_CMD_TEXBUFWIDTH6: case GE_CMD_TEXBUFWIDTH7: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; break; case GE_CMD_CLUTADDR: case GE_CMD_CLUTADDRUPPER: case GE_CMD_CLUTFORMAT: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; // This could be used to "dirty" textures with clut. break; case GE_CMD_LOADCLUT: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; textureCache_.LoadClut(); // This could be used to "dirty" textures with clut. break; @@ -897,7 +897,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { DoBlockTransfer(); // Fixes Gran Turismo's funky text issue. - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; break; } @@ -913,7 +913,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_TEXSIZE5: case GE_CMD_TEXSIZE6: case GE_CMD_TEXSIZE7: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; break; case GE_CMD_ZBUFPTR: @@ -1046,7 +1046,7 @@ void DIRECTX9_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_VIEWPORTZ2: if (diff) { gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; } break; @@ -1381,7 +1381,7 @@ void DIRECTX9_GPU::DoState(PointerWrap &p) { textureCache_.Clear(true); transformDraw_.ClearTrackedVertexArrays(); - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; framebufferManager_.DestroyAllFBOs(); shaderManager_->ClearCache(true); } diff --git a/GPU/Directx9/StateMappingDX9.cpp b/GPU/Directx9/StateMappingDX9.cpp index 3ffa839563..1b9f57c85d 100644 --- a/GPU/Directx9/StateMappingDX9.cpp +++ b/GPU/Directx9/StateMappingDX9.cpp @@ -112,11 +112,11 @@ static bool blendColorSimilar(const Vec3f &a, const Vec3f &b, float margin = 0.1 void TransformDrawEngineDX9::ApplyDrawState(int prim) { // TODO: All this setup is soon so expensive that we'll need dirty flags, or simply do it in the command writes where we detect dirty by xoring. Silly to do all this work on every drawcall. - if (gstate_c.textureChanged) { + if (gstate_c.textureChanged != TEXCHANGE_UNCHANGED) { if (gstate.isTextureMapEnabled()) { textureCache_->SetTexture(); } - gstate_c.textureChanged = false; + gstate_c.textureChanged = TEXCHANGE_UNCHANGED; } // TODO: The top bit of the alpha channel should be written to the stencil bit somehow. This appears to require very expensive multipass rendering :( Alternatively, one could do a diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 29e02bca0f..8871eaf57f 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -755,7 +755,7 @@ void FramebufferManager::DoSetRenderFrameBuffer() { // None found? Create one. if (!vfb) { - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; vfb = new VirtualFramebuffer(); vfb->fbo = 0; vfb->fb_address = fb_address; @@ -859,7 +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; - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; vfb->last_frame_render = gpuStats.numFlips; frameLastFramebufUsed = gpuStats.numFlips; vfb->dirtyAfterDisplay = true; @@ -1191,7 +1191,7 @@ void FramebufferManager::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool s glEnable(GL_DITHER); } else { nvfb->usageFlags |= FB_USAGE_RENDERTARGET; - gstate_c.textureChanged = true; + 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 fec550719c..4c1842d646 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -610,7 +610,7 @@ void GLES_GPU::CopyDisplayToOutputInternal() { #endif #endif - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; } // Maybe should write this in ASM... @@ -906,7 +906,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_REGION1: case GE_CMD_REGION2: gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_CLIPENABLE: @@ -968,7 +968,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_SCISSOR1: case GE_CMD_SCISSOR2: gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; /// @@ -980,11 +980,11 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_FRAMEBUFWIDTH: case GE_CMD_FRAMEBUFPIXFORMAT: gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_TEXADDR0: - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; shaderManager_->DirtyUniform(DIRTY_UVSCALEOFFSET); break; @@ -995,10 +995,13 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXADDR5: case GE_CMD_TEXADDR6: case GE_CMD_TEXADDR7: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_TEXBUFWIDTH0: + gstate_c.textureChanged = TEXCHANGE_UPDATED; + break; + case GE_CMD_TEXBUFWIDTH1: case GE_CMD_TEXBUFWIDTH2: case GE_CMD_TEXBUFWIDTH3: @@ -1006,11 +1009,11 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXBUFWIDTH5: case GE_CMD_TEXBUFWIDTH6: case GE_CMD_TEXBUFWIDTH7: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_CLUTFORMAT: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; // This could be used to "dirty" textures with clut. break; @@ -1020,7 +1023,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { break; case GE_CMD_LOADCLUT: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; textureCache_.LoadClut(); // This could be used to "dirty" textures with clut. break; @@ -1051,19 +1054,19 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { DoBlockTransfer(); // Fixes Gran Turismo's funky text issue, since it overwrites the current texture. - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; break; } case GE_CMD_TEXSIZE0: // Render to texture may have overridden the width/height. // Don't reset it unless the size is different / the texture has changed. - if (diff || gstate_c.textureChanged) { + if (diff || gstate_c.textureChanged != TEXCHANGE_UNCHANGED) { gstate_c.curTextureWidth = gstate.getTextureWidth(0); gstate_c.curTextureHeight = gstate.getTextureHeight(0); shaderManager_->DirtyUniform(DIRTY_UVSCALEOFFSET); // We will need to reset the texture now. - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; } break; @@ -1074,7 +1077,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXSIZE5: case GE_CMD_TEXSIZE6: case GE_CMD_TEXSIZE7: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_ZBUFPTR: @@ -1195,7 +1198,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_VIEWPORTZ1: case GE_CMD_VIEWPORTZ2: gstate_c.framebufChanged = true; - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; case GE_CMD_LIGHTENABLE0: @@ -1262,11 +1265,14 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { case GE_CMD_TEXFLUSH: break; - case GE_CMD_TEXMODE: case GE_CMD_TEXFORMAT: + gstate_c.textureChanged = TEXCHANGE_UPDATED; + break; + + case GE_CMD_TEXMODE: case GE_CMD_TEXFILTER: case GE_CMD_TEXWRAP: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; ////////////////////////////////////////////////////////////////// @@ -1545,7 +1551,7 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) { #endif case GE_CMD_TEXLEVEL: - gstate_c.textureChanged = true; + gstate_c.textureChanged |= TEXCHANGE_PARAMSONLY; break; ////////////////////////////////////////////////////////////////// @@ -1785,7 +1791,7 @@ void GLES_GPU::DoState(PointerWrap &p) { textureCache_.Clear(true); transformDraw_.ClearTrackedVertexArrays(); - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; framebufferManager_.DestroyAllFBOs(); } } diff --git a/GPU/GLES/StateMapping.cpp b/GPU/GLES/StateMapping.cpp index 9e8a6f1e4a..e6a7eb688c 100644 --- a/GPU/GLES/StateMapping.cpp +++ b/GPU/GLES/StateMapping.cpp @@ -166,9 +166,9 @@ static inline bool blendColorSimilar(const Vec3f &a, const Vec3f &b, float margi void TransformDrawEngine::ApplyDrawState(int prim) { // TODO: All this setup is soon so expensive that we'll need dirty flags, or simply do it in the command writes where we detect dirty by xoring. Silly to do all this work on every drawcall. - if (gstate_c.textureChanged && !gstate.isModeClear() && gstate.isTextureMapEnabled()) { + if (gstate_c.textureChanged != TEXCHANGE_UNCHANGED && !gstate.isModeClear() && gstate.isTextureMapEnabled()) { textureCache_->SetTexture(); - gstate_c.textureChanged = false; + gstate_c.textureChanged = TEXCHANGE_UNCHANGED; } // TODO: The top bit of the alpha channel should be written to the stencil bit somehow. This appears to require very expensive multipass rendering :( Alternatively, one could do a diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 394100bed8..280fc628d7 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -922,6 +922,11 @@ void TextureCache::SetTexture(bool force) { bool rehash = entry->GetHashStatus() == TexCacheEntry::STATUS_UNRELIABLE; 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_UPDATED) == 0) { + rehash = false; + } + if (match) { if (entry->lastFrame != gpuStats.numFlips) { u32 diff = gpuStats.numFlips - entry->lastFrame; diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 13510e733c..3f0cf79060 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -648,7 +648,7 @@ void GPUCommon::ProcessDLQueueInternal() { UpdateTickEstimate(std::max(busyTicks, startingTicks + cyclesExecuted)); // Game might've written new texture data. - gstate_c.textureChanged = true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; // Seems to be correct behaviour to process the list anyway? if (startingTicks < busyTicks) { diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp index 47c0c4dfb3..a2d095a4db 100644 --- a/GPU/GPUState.cpp +++ b/GPU/GPUState.cpp @@ -27,6 +27,7 @@ #include "GPU/Directx9/helper/global.h" #include "GPU/Directx9/GPU_DX9.h" #endif +#include "Common/ChunkFile.h" #include "Core/CoreParameter.h" #include "Core/Config.h" #include "Core/System.h" @@ -249,3 +250,93 @@ bool vertTypeIsSkinningEnabled(u32 vertType) { else return ((vertType & GE_VTYPE_WEIGHT_MASK) != GE_VTYPE_WEIGHT_NONE); } + +struct GPUStateCache_v0 +{ + u32 vertexAddr; + u32 indexAddr; + + u32 offsetAddr; + + bool textureChanged; + bool textureFullAlpha; + bool vertexFullAlpha; + bool framebufChanged; + + int skipDrawReason; + + UVScale uv; + bool flipTexture; + + float lightpos[4][3]; + float lightdir[4][3]; + float lightatt[4][3]; + float lightColor[3][4][3]; // Ambient Diffuse Specular + float lightangle[4]; // spotlight cone angle (cosine) + float lightspotCoef[4]; // spotlight dropoff + float morphWeights[8]; + + u32 curTextureWidth; + u32 curTextureHeight; + u32 actualTextureHeight; + + float vpWidth; + float vpHeight; + + u32 curRTWidth; + u32 curRTHeight; +}; + +void GPUStateCache::DoState(PointerWrap &p) { + auto s = p.Section("GPUStateCache", 0, 1); + if (!s) { + // Old state, this was not versioned. + GPUStateCache_v0 old; + p.Do(old); + + vertexAddr = old.vertexAddr; + indexAddr = old.indexAddr; + offsetAddr = old.offsetAddr; + textureChanged = TEXCHANGE_UPDATED; + textureFullAlpha = old.textureFullAlpha; + vertexFullAlpha = old.vertexFullAlpha; + framebufChanged = old.framebufChanged; + + const size_t oldOffset = offsetof(GPUStateCache_v0, skipDrawReason); + const size_t newOffset = offsetof(GPUStateCache, skipDrawReason); + memcpy((char *)this + newOffset, (char *)&old + oldOffset, sizeof(old) - oldOffset); + return; + } + + p.Do(vertexAddr); + p.Do(indexAddr); + p.Do(offsetAddr); + + p.Do(textureChanged); + p.Do(textureFullAlpha); + p.Do(vertexFullAlpha); + p.Do(framebufChanged); + + p.Do(skipDrawReason); + + p.Do(uv); + p.Do(flipTexture); + + p.Do(lightpos); + p.Do(lightdir); + p.Do(lightatt); + p.Do(lightColor); + p.Do(lightangle); + p.Do(lightspotCoef); + p.Do(morphWeights); + + p.Do(curTextureWidth); + p.Do(curTextureHeight); + p.Do(actualTextureHeight); + + p.Do(vpWidth); + p.Do(vpHeight); + + p.Do(curRTWidth); + p.Do(curRTHeight); +} diff --git a/GPU/GPUState.h b/GPU/GPUState.h index f7533097e4..7933a91c35 100644 --- a/GPU/GPUState.h +++ b/GPU/GPUState.h @@ -23,6 +23,8 @@ #include "ge_constants.h" #include "Common/Common.h" +class PointerWrap; + // PSP uses a curious 24-bit float - it's basically the top 24 bits of a regular IEEE754 32-bit float. // This is used for light positions, transform matrices, you name it. inline float getFloat24(unsigned int data) @@ -432,6 +434,12 @@ struct UVScale { float uOff, vOff; }; +enum TextureChangeReason { + TEXCHANGE_UNCHANGED = 0x00, + TEXCHANGE_UPDATED = 0x01, + TEXCHANGE_PARAMSONLY = 0x02, +}; + struct GPUStateCache { u32 vertexAddr; @@ -439,7 +447,7 @@ struct GPUStateCache u32 offsetAddr; - bool textureChanged; + u8 textureChanged; bool textureFullAlpha; bool vertexFullAlpha; bool framebufChanged; @@ -468,6 +476,7 @@ struct GPUStateCache u32 curRTHeight; u32 getRelativeAddress(u32 data) const; + void DoState(PointerWrap &p); }; // TODO: Implement support for these. diff --git a/GPU/Null/NullGpu.cpp b/GPU/Null/NullGpu.cpp index 4f766001a5..88e067f369 100644 --- a/GPU/Null/NullGpu.cpp +++ b/GPU/Null/NullGpu.cpp @@ -214,7 +214,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) { break; case GE_CMD_TEXADDR0: - gstate_c.textureChanged=true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; case GE_CMD_TEXADDR1: case GE_CMD_TEXADDR2: case GE_CMD_TEXADDR3: @@ -226,7 +226,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) { break; case GE_CMD_TEXBUFWIDTH0: - gstate_c.textureChanged=true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; case GE_CMD_TEXBUFWIDTH1: case GE_CMD_TEXBUFWIDTH2: case GE_CMD_TEXBUFWIDTH3: @@ -314,7 +314,7 @@ void NullGPU::ExecuteOp(u32 op, u32 diff) { } case GE_CMD_TEXSIZE0: - gstate_c.textureChanged=true; + gstate_c.textureChanged = TEXCHANGE_UPDATED; gstate_c.curTextureWidth = 1 << (gstate.texsize[0] & 0xf); gstate_c.curTextureHeight = 1 << ((gstate.texsize[0]>>8) & 0xf); //fall thru - ignoring the mipmap sizes for now