Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Put the shader info log at the end of the shader log file. This fixes…
… issue 6495.
  • Loading branch information
Sonicadvance1 committed Aug 16, 2013
1 parent 1ba9855 commit 49963da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
Expand Up @@ -296,7 +296,7 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons
sprintf(szTemp, "%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file;
OpenFStream(file, szTemp, std::ios_base::out);
file << infoLog << s_glsl_header << vcode << s_glsl_header << pcode;
file << s_glsl_header << vcode << s_glsl_header << pcode << infoLog;
file.close();

PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
Expand Down Expand Up @@ -353,7 +353,7 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
num_failures++);
std::ofstream file;
OpenFStream(file, szTemp, std::ios_base::out);
file << infoLog << s_glsl_header << code;
file << s_glsl_header << code << infoLog;
file.close();

PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
Expand Down

0 comments on commit 49963da

Please sign in to comment.