Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

GLES: Log shader cache filesize error better.

Browse source
This commit is contained in:
Unknown W. Brackets 2017-12-02 10:20:44 -08:00
parent 9c52155d3f
commit 681ce953ec
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
GPU/GLES/ShaderManagerGLES.cpp
View file

@ -983,14 +983,13 @@ void ShaderManagerGLES::LoadAndPrecompile(const std::string &filename) {
expectedSize += header.numFragmentShaders * sizeof(FShaderID); expectedSize += header.numFragmentShaders * sizeof(FShaderID);
expectedSize += header.numLinkedPrograms * (sizeof(VShaderID) + sizeof(FShaderID)); expectedSize += header.numLinkedPrograms * (sizeof(VShaderID) + sizeof(FShaderID));
if (sz != expectedSize) { if (sz != expectedSize) {
ERROR_LOG(G3D, "Shader cache file is too large, aborting."); ERROR_LOG(G3D, "Shader cache file is wrong size: %lld instead of %lld", sz, expectedSize);
return; return;
} }
for (int i = 0; i < header.numVertexShaders; i++) { for (int i = 0; i < header.numVertexShaders; i++) {
VShaderID id; VShaderID id;
if (!f.ReadArray(&id, 1)) { if (!f.ReadArray(&id, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return; return;
} }
if (!vsCache_.Get(id)) { if (!vsCache_.Get(id)) {
@ -1016,7 +1015,6 @@ void ShaderManagerGLES::LoadAndPrecompile(const std::string &filename) {
for (int i = 0; i < header.numFragmentShaders; i++) { for (int i = 0; i < header.numFragmentShaders; i++) {
FShaderID id; FShaderID id;
if (!f.ReadArray(&id, 1)) { if (!f.ReadArray(&id, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return; return;
} }
if (!fsCache_.Get(id)) { if (!fsCache_.Get(id)) {
@ -1029,11 +1027,9 @@ void ShaderManagerGLES::LoadAndPrecompile(const std::string &filename) {
VShaderID vsid; VShaderID vsid;
FShaderID fsid; FShaderID fsid;
if (!f.ReadArray(&vsid, 1)) { if (!f.ReadArray(&vsid, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return; return;
} }
if (!f.ReadArray(&fsid, 1)) { if (!f.ReadArray(&fsid, 1)) {
ERROR_LOG(G3D, "Truncated shader cache file, aborting.");
return; return;
} }
Shader *vs = vsCache_.Get(vsid); Shader *vs = vsCache_.Get(vsid);