Skip to content

Commit

Permalink
GLES: Log shader cache filesize error better.
Browse files Browse the repository at this point in the history
  • Loading branch information
unknownbrackets committed Dec 2, 2017
1 parent 9c52155 commit 681ce95
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions GPU/GLES/ShaderManagerGLES.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)) {
Expand All @@ -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);
Expand Down

0 comments on commit 681ce95

Please sign in to comment.