ogl: don't PanicAlert on shader compiler warnings

This commit is contained in:
degasus 2013-09-18 11:47:44 +02:00
parent 24a44ecfb8
commit 28f2bd310d

View File

@ -308,12 +308,13 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons
file << s_glsl_header << vcode << s_glsl_header << pcode << infoLog; 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", if(linkStatus != GL_TRUE)
szTemp, 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",
g_ogl_config.gl_vendor, szTemp,
g_ogl_config.gl_renderer, g_ogl_config.gl_vendor,
g_ogl_config.gl_version, g_ogl_config.gl_renderer,
infoLog); g_ogl_config.gl_version,
infoLog);
delete [] infoLog; delete [] infoLog;
} }
@ -365,13 +366,14 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
file << s_glsl_header << code << infoLog; 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", if(compileStatus != GL_TRUE)
type==GL_VERTEX_SHADER ? "vertex" : "pixel", 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",
szTemp, type==GL_VERTEX_SHADER ? "vertex" : "pixel",
g_ogl_config.gl_vendor, szTemp,
g_ogl_config.gl_renderer, g_ogl_config.gl_vendor,
g_ogl_config.gl_version, g_ogl_config.gl_renderer,
infoLog); g_ogl_config.gl_version,
infoLog);
delete[] infoLog; delete[] infoLog;
} }