Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-22 07:03:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Check for HW-transform and through when loading GL shader cache.

Browse Source
This commit is contained in:
Henrik Rydgård 2017-12-01 11:32:16 +01:00
parent be115822f7
commit 8a58b768f1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPU/Common/ShaderId.cpp
View File

@ -77,7 +77,7 @@ void ComputeVertexShaderID(ShaderID *id_out, u32 vertType, bool useHWTransform)
ShaderID id; ShaderID id;
id.SetBit(VS_BIT_LMODE, lmode); id.SetBit(VS_BIT_LMODE, lmode);
id.SetBit(VS_BIT_IS_THROUGH, gstate.isModeThrough()); id.SetBit(VS_BIT_IS_THROUGH, isModeThrough);
id.SetBit(VS_BIT_ENABLE_FOG, enableFog); id.SetBit(VS_BIT_ENABLE_FOG, enableFog);
id.SetBit(VS_BIT_HAS_COLOR, hasColor); id.SetBit(VS_BIT_HAS_COLOR, hasColor);

9
GPU/GLES/ShaderManagerGLES.cpp
View File

@ -764,10 +764,9 @@ Shader *ShaderManagerGLES::ApplyVertexShader(int prim, u32 vertType, ShaderID *V
gstate_c.CleanUniforms(); gstate_c.CleanUniforms();
} }
bool useHWTransform = CanUseHardwareTransform(prim);
if (gstate_c.IsDirty(DIRTY_VERTEXSHADER_STATE)) { if (gstate_c.IsDirty(DIRTY_VERTEXSHADER_STATE)) {
gstate_c.Clean(DIRTY_VERTEXSHADER_STATE); gstate_c.Clean(DIRTY_VERTEXSHADER_STATE);
bool useHWTransform = CanUseHardwareTransform(prim);
ComputeVertexShaderID(VSID, vertType, useHWTransform); ComputeVertexShaderID(VSID, vertType, useHWTransform);
} else { } else {
*VSID = lastVSID_; *VSID = lastVSID_;
@ -978,6 +977,12 @@ void ShaderManagerGLES::LoadAndPrecompile(const std::string &filename) {
return; return;
} }
if (!vsCache_.Get(id)) { if (!vsCache_.Get(id)) {
if (id.Bit(VS_BIT_IS_THROUGH) && id.Bit(VS_BIT_USE_HW_TRANSFORM)) {
// Clearly corrupt, bailing.
ERROR_LOG_REPORT(G3D, "Corrupt shader cache: Both IS_THROUGH and USE_HW_TRANSFORM set.");
return;
}
Shader *vs = CompileVertexShader(id); Shader *vs = CompileVertexShader(id);
if (vs->Failed()) { if (vs->Failed()) {
// Give up on using the cache, just bail. We can't safely create the fallback shaders here // Give up on using the cache, just bail. We can't safely create the fallback shaders here