From: vortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 19 Feb 2012 00:43:54 +0000 (+0000)
Subject: Fix shader compile log again. Print error in any case, warnings only if developer... 
X-Git-Tag: xonotic-v0.8.0~96^2~314
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=373e4cb04d53e0733ed7f764c3a3acfdd597f2c4;p=xonotic%2Fdarkplaces.git

Fix shader compile log again. Print error in any case, warnings only if developer, all other if developer_extra.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11702 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_backend.c b/gl_backend.c
index 2f14c54a..fefedcb3 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -2630,14 +2630,14 @@ static qboolean GL_Backend_CompileShader(int programobject, GLenum shadertypeenu
 	qglCompileShader(shaderobject);CHECKGLERROR
 	qglGetShaderiv(shaderobject, GL_COMPILE_STATUS, &shadercompiled);CHECKGLERROR
 	qglGetShaderInfoLog(shaderobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR
-	if (compilelog[0] && (strstr(compilelog, "error") || strstr(compilelog, "ERROR") || strstr(compilelog, "Error") || strstr(compilelog, "WARNING") || strstr(compilelog, "warning") || strstr(compilelog, "Warning") || developer_extra.integer))
+	if (compilelog[0] && ((strstr(compilelog, "error") || strstr(compilelog, "ERROR") || strstr(compilelog, "Error")) || ((strstr(compilelog, "WARNING") || strstr(compilelog, "warning") || strstr(compilelog, "Warning")) && developer.integer) || developer_extra.integer))
 	{
 		int i, j, pretextlines = 0;
 		for (i = 0;i < numstrings - 1;i++)
 			for (j = 0;strings[i][j];j++)
 				if (strings[i][j] == '\n')
 					pretextlines++;
-		Con_DPrintf("%s shader compile log:\n%s\n(line offset for any above warnings/errors: %i)\n", shadertype, compilelog, pretextlines);
+		Con_Printf("%s shader compile log:\n%s\n(line offset for any above warnings/errors: %i)\n", shadertype, compilelog, pretextlines);
 	}
 	if (!shadercompiled)
 	{