Slightly more verbose output for glsl linker errors.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4052 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
da3ac7e993
commit
f96c737175
1 changed files with 4 additions and 4 deletions
|
@ -1230,11 +1230,11 @@ GLhandleARB GLSlang_CreateShader (char *name, int ver, char **precompilerconstan
|
||||||
return shader;
|
return shader;
|
||||||
}
|
}
|
||||||
|
|
||||||
GLhandleARB GLSlang_CreateProgramObject (GLhandleARB vert, GLhandleARB frag, qboolean silent)
|
GLhandleARB GLSlang_CreateProgramObject (char *name, GLhandleARB vert, GLhandleARB frag, qboolean silent)
|
||||||
{
|
{
|
||||||
GLhandleARB program;
|
GLhandleARB program;
|
||||||
GLint linked;
|
GLint linked;
|
||||||
char str[1024];
|
char str[2048];
|
||||||
|
|
||||||
program = qglCreateProgramObjectARB();
|
program = qglCreateProgramObjectARB();
|
||||||
qglAttachObjectARB(program, vert);
|
qglAttachObjectARB(program, vert);
|
||||||
|
@ -1260,7 +1260,7 @@ GLhandleARB GLSlang_CreateProgramObject (GLhandleARB vert, GLhandleARB frag, qbo
|
||||||
if (!silent)
|
if (!silent)
|
||||||
{
|
{
|
||||||
qglGetProgramInfoLog_(program, sizeof(str), NULL, str);
|
qglGetProgramInfoLog_(program, sizeof(str), NULL, str);
|
||||||
Con_Printf("Program link error: %s\n", str);
|
Con_Printf("Program link error on glsl program %s:\n%s\n", name, str);
|
||||||
}
|
}
|
||||||
|
|
||||||
qglDeleteProgramObject_(program);
|
qglDeleteProgramObject_(program);
|
||||||
|
@ -1289,7 +1289,7 @@ GLhandleARB GLSlang_CreateProgram(char *name, int ver, char **precompilerconstan
|
||||||
if (!vs || !fs)
|
if (!vs || !fs)
|
||||||
handle = 0;
|
handle = 0;
|
||||||
else
|
else
|
||||||
handle = GLSlang_CreateProgramObject(vs, fs, silent);
|
handle = GLSlang_CreateProgramObject(name, vs, fs, silent);
|
||||||
//delete ignores 0s.
|
//delete ignores 0s.
|
||||||
qglDeleteShaderObject_(vs);
|
qglDeleteShaderObject_(vs);
|
||||||
qglDeleteShaderObject_(fs);
|
qglDeleteShaderObject_(fs);
|
||||||
|
|
Loading…
Reference in a new issue