ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-14 00:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenGL2: Fix shader error logs.

Browse source
This commit is contained in:
SmileTheory 2016-08-04 20:16:22 -07:00
parent 29ac117154
commit 5252e28163
1 changed files with 53 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
code/renderergl2/tr_glsl.c
View file

@ -148,8 +148,15 @@ static uniformInfo_t uniformsInfo[] =
{ "u_CubeMapInfo", GLSL_VEC4 }, { "u_CubeMapInfo", GLSL_VEC4 },
}; };
typedef enum
{
GLSL_PRINTLOG_PROGRAM_INFO,
GLSL_PRINTLOG_SHADER_INFO,
GLSL_PRINTLOG_SHADER_SOURCE
}
glslPrintLog_t;
static void GLSL_PrintInfoLog(GLuint program, qboolean developerOnly) static void GLSL_PrintLog(GLuint programOrShader, glslPrintLog_t type, qboolean developerOnly)
{ {
char *msg; char *msg;
static char msgPart[1024]; static char msgPart[1024];
@ -157,61 +164,70 @@ static void GLSL_PrintInfoLog(GLuint program, qboolean developerOnly)
int i; int i;
int printLevel = developerOnly ? PRINT_DEVELOPER : PRINT_ALL; int printLevel = developerOnly ? PRINT_DEVELOPER : PRINT_ALL;
qglGetProgramiv(program, GL_INFO_LOG_LENGTH, &maxLength); switch (type)
{
case GLSL_PRINTLOG_PROGRAM_INFO:
ri.Printf(printLevel, "Program info log:\n");
qglGetProgramiv(programOrShader, GL_INFO_LOG_LENGTH, &maxLength);
break;
case GLSL_PRINTLOG_SHADER_INFO:
ri.Printf(printLevel, "Shader info log:\n");
qglGetShaderiv(programOrShader, GL_INFO_LOG_LENGTH, &maxLength);
break;
case GLSL_PRINTLOG_SHADER_SOURCE:
ri.Printf(printLevel, "Shader source:\n");
qglGetShaderiv(programOrShader, GL_SHADER_SOURCE_LENGTH, &maxLength);
break;
}
if (maxLength <= 0) if (maxLength <= 0)
{ {
ri.Printf(printLevel, "No compile log.\n"); ri.Printf(printLevel, "None.\n");
return; return;
} }
ri.Printf(printLevel, "compile log:\n"); if (maxLength < 1023)
msg = msgPart;
else
msg = ri.Malloc(maxLength);
switch (type)
{
case GLSL_PRINTLOG_PROGRAM_INFO:
qglGetProgramInfoLog(programOrShader, maxLength, &maxLength, msg);
break;
case GLSL_PRINTLOG_SHADER_INFO:
qglGetShaderInfoLog(programOrShader, maxLength, &maxLength, msg);
break;
case GLSL_PRINTLOG_SHADER_SOURCE:
qglGetShaderSource(programOrShader, maxLength, &maxLength, msg);
break;
}
if (maxLength < 1023) if (maxLength < 1023)
{ {
qglGetProgramInfoLog(program, maxLength, &maxLength, msgPart);
msgPart[maxLength + 1] = '\0'; msgPart[maxLength + 1] = '\0';
ri.Printf(printLevel, "%s\n", msgPart); ri.Printf(printLevel, "%s\n", msgPart);
} }
else else
{ {
msg = ri.Malloc(maxLength); for(i = 0; i < maxLength; i += 1023)
qglGetProgramInfoLog(program, maxLength, &maxLength, msg);
for(i = 0; i < maxLength; i += 1024)
{ {
Q_strncpyz(msgPart, msg + i, sizeof(msgPart)); Q_strncpyz(msgPart, msg + i, sizeof(msgPart));
ri.Printf(printLevel, "%s\n", msgPart); ri.Printf(printLevel, "%s", msgPart);
} }
ri.Printf(printLevel, "\n");
ri.Free(msg); ri.Free(msg);
} }
}
static void GLSL_PrintShaderSource(GLuint shader)
{
char *msg;
static char msgPart[1024];
int maxLength = 0;
int i;
qglGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &maxLength);
msg = ri.Malloc(maxLength);
qglShaderSource(shader, 1, (const GLchar **)&msg, &maxLength);
for(i = 0; i < maxLength; i += 1024)
{
Q_strncpyz(msgPart, msg + i, sizeof(msgPart));
ri.Printf(PRINT_ALL, "%s\n", msgPart);
}
ri.Free(msg);
} }
static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *dest, int size ) static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *dest, int size )
@ -365,15 +381,12 @@ static int GLSL_CompileGPUShader(GLuint program, GLuint *prevShader, const GLcha
qglGetShaderiv(shader, GL_COMPILE_STATUS, &compiled); qglGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
if(!compiled) if(!compiled)
{ {
GLSL_PrintShaderSource(shader); GLSL_PrintLog(shader, GLSL_PRINTLOG_SHADER_SOURCE, qfalse);
GLSL_PrintInfoLog(shader, qfalse); GLSL_PrintLog(shader, GLSL_PRINTLOG_SHADER_INFO, qfalse);
ri.Error(ERR_DROP, "Couldn't compile shader"); ri.Error(ERR_DROP, "Couldn't compile shader");
return 0; return 0;
} }
//GLSL_PrintInfoLog(shader, qtrue);
//GLSL_PrintShaderSource(shader);
if (*prevShader) if (*prevShader)
{ {
qglDetachShader(program, *prevShader); qglDetachShader(program, *prevShader);
@ -460,8 +473,7 @@ static void GLSL_LinkProgram(GLuint program)
qglGetProgramiv(program, GL_LINK_STATUS, &linked); qglGetProgramiv(program, GL_LINK_STATUS, &linked);
if(!linked) if(!linked)
{ {
GLSL_PrintInfoLog(program, qfalse); GLSL_PrintLog(program, GLSL_PRINTLOG_PROGRAM_INFO, qfalse);
ri.Printf(PRINT_ALL, "\n");
ri.Error(ERR_DROP, "shaders failed to link"); ri.Error(ERR_DROP, "shaders failed to link");
} }
} }
@ -475,8 +487,7 @@ static void GLSL_ValidateProgram(GLuint program)
qglGetProgramiv(program, GL_VALIDATE_STATUS, &validated); qglGetProgramiv(program, GL_VALIDATE_STATUS, &validated);
if(!validated) if(!validated)
{ {
GLSL_PrintInfoLog(program, qfalse); GLSL_PrintLog(program, GLSL_PRINTLOG_PROGRAM_INFO, qfalse);
ri.Printf(PRINT_ALL, "\n");
ri.Error(ERR_DROP, "shaders failed to validate"); ri.Error(ERR_DROP, "shaders failed to validate");
} }
} }