summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-03-15 16:42:22 +0100
committerJosJuice <josjuice@gmail.com>2015-06-04 13:25:06 +0200
commit95a2abc1ce6d0d9304f32725cdf784f2e3d7d1f3 (patch)
tree48739bfd920a6fcf32379804fd6fe7e652134499 /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
parent98ed5881abaf1fa61c9c9638cbb093280297b8e5 (diff)
Use PanicAlertT instead of PanicAlert when appropriate
I tried to change messages that contained instructions for users, while avoiding messages that are so technical that most users wouldn't understand them even if they were in the right language.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 9bb0a72014..4ff8bf28de 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -312,12 +312,10 @@ bool ProgramShaderCache::CompileShader(SHADER& shader, const char* vcode, const
if (linkStatus != GL_TRUE)
{
- 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",
- filename.c_str(),
- g_ogl_config.gl_vendor,
- g_ogl_config.gl_renderer,
- g_ogl_config.gl_version,
- infoLog);
+ PanicAlert("Failed to link shaders: %s\n"
+ "Debug info (%s, %s, %s):\n%s",
+ filename.c_str(),
+ g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version, infoLog);
}
delete [] infoLog;
@@ -371,13 +369,11 @@ GLuint ProgramShaderCache::CompileSingleShader(GLuint type, const char* code)
if (compileStatus != GL_TRUE)
{
- 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",
- type == GL_VERTEX_SHADER ? "vertex" : type==GL_FRAGMENT_SHADER ? "pixel" : "geometry",
- filename.c_str(),
- g_ogl_config.gl_vendor,
- g_ogl_config.gl_renderer,
- g_ogl_config.gl_version,
- infoLog);
+ PanicAlert("Failed to compile %s shader: %s\n"
+ "Debug info (%s, %s, %s):\n%s",
+ type == GL_VERTEX_SHADER ? "vertex" : type==GL_FRAGMENT_SHADER ? "pixel" : "geometry",
+ filename.c_str(),
+ g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version, infoLog);
}
delete[] infoLog;