From 8a58b768f1406a2d1a13cbca2a3847bb01746175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 1 Dec 2017 11:32:16 +0100 Subject: [PATCH] Check for HW-transform and through when loading GL shader cache. --- GPU/Common/ShaderId.cpp | 2 +- GPU/GLES/ShaderManagerGLES.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/GPU/Common/ShaderId.cpp b/GPU/Common/ShaderId.cpp index 5428f7f0a4..df140be611 100644 --- a/GPU/Common/ShaderId.cpp +++ b/GPU/Common/ShaderId.cpp @@ -77,7 +77,7 @@ void ComputeVertexShaderID(ShaderID *id_out, u32 vertType, bool useHWTransform) ShaderID id; 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_HAS_COLOR, hasColor); diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index e8d61ffcb8..2de78fc45b 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -764,10 +764,9 @@ Shader *ShaderManagerGLES::ApplyVertexShader(int prim, u32 vertType, ShaderID *V gstate_c.CleanUniforms(); } - bool useHWTransform = CanUseHardwareTransform(prim); - if (gstate_c.IsDirty(DIRTY_VERTEXSHADER_STATE)) { gstate_c.Clean(DIRTY_VERTEXSHADER_STATE); + bool useHWTransform = CanUseHardwareTransform(prim); ComputeVertexShaderID(VSID, vertType, useHWTransform); } else { *VSID = lastVSID_; @@ -978,6 +977,12 @@ void ShaderManagerGLES::LoadAndPrecompile(const std::string &filename) { return; } 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); if (vs->Failed()) { // Give up on using the cache, just bail. We can't safely create the fallback shaders here