Put the shader info log at the end of the shader log file. This fixes issue 6495.

This commit is contained in:
Ryan Houdek 2013-08-16 21:05:35 +00:00
parent 1ba98550ef
commit 49963da371
1 changed files with 2 additions and 2 deletions

View File

@ -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++); sprintf(szTemp, "%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file; std::ofstream file;
OpenFStream(file, szTemp, std::ios_base::out); 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(); 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", 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",
@ -353,7 +353,7 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
num_failures++); num_failures++);
std::ofstream file; std::ofstream file;
OpenFStream(file, szTemp, std::ios_base::out); OpenFStream(file, szTemp, std::ios_base::out);
file << infoLog << s_glsl_header << code; file << s_glsl_header << code << infoLog;
file.close(); 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", 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",