fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix logic for reporting errors

Browse source
This commit is contained in:
Brian 2007-02-26 16:32:00 -07:00
parent f446e58e45
commit 4b8d75e2e6
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/shader/slang/slang_compile.c
View file

@ -1898,6 +1898,17 @@ compile_with_grammar(grammar id, const char *source, slang_code_unit * unit,
grammar_get_last_error((byte *) (buf), sizeof(buf), &pos);
slang_info_log_error(infolog, buf);
/* syntax error (possibly in library code) */
#if 0
{
int line, col;
char *s;
s = (char *) _mesa_find_line_column((const GLubyte *) source,
(const GLubyte *) source + pos,
&line, &col);
printf("Error on line %d, col %d: %s\n", line, col, s);
}
#endif
return GL_FALSE;
}
slang_string_free(&preprocessed);
@ -2070,16 +2081,19 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
success = compile_shader(ctx, &obj, type, &info_log, shader);
if (!success || info_log.error_flag) {
success = GL_FALSE;
/* free shader's prev info log */
if (shader->InfoLog) {
_mesa_free(shader->InfoLog);
shader->InfoLog = NULL;
}
if (info_log.text) {
/* copy info-log string to shader object */
if (info_log.text) {
if (shader->InfoLog) {
free(shader->InfoLog);
shader->InfoLog = NULL;
}
shader->InfoLog = strdup(info_log.text);
}
shader->InfoLog = _mesa_strdup(info_log.text);
}
if (info_log.error_flag) {
success = GL_FALSE;
}
slang_info_log_destruct(&info_log);