summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@Gmail.com>2013-08-16 21:05:35 +0000
committerRyan Houdek <Sonicadvance1@Gmail.com>2013-08-16 21:05:35 +0000
commit49963da371bdc691cb2f9eb01cced90586269681 (patch)
treed369247cf1f7c380f29a2a79ad29a83651d453a1 /Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
parent1ba98550effa9b8d2006d1f7823deb56906542e5 (diff)
Put the shader info log at the end of the shader log file. This fixes issue 6495.
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index c64ddbe1ac..9c068a7f03 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -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",
@@ -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",