OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Add boolean 'error' flag.

Browse Source 
We used to check if the info log is non-empty, but when we print
warnings, this will no longer be valid.
This commit is contained in:
Kenneth Graunke
2010-06-21 12:39:49 -07:00
parent 33eaa3e0b3
commit 62b4b7785a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
glcpp/glcpp.h
View File

@@ -155,6 +155,7 @@ struct glcpp_parser {
token_node_t *lex_from_node; token_node_t *lex_from_node;
char *output; char *output;
char *info_log; char *info_log;
int error;
}; };
glcpp_parser_t * glcpp_parser_t *

3
glcpp/pp.c
View File

@@ -26,6 +26,7 @@
void void
glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...) glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
{ {
parser->error = 1;
parser->info_log = talloc_asprintf_append(parser->info_log, parser->info_log = talloc_asprintf_append(parser->info_log,
"%u:%u(%u): " "%u:%u(%u): "
"preprocessor error: ", "preprocessor error: ",
@@ -48,13 +49,13 @@ preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
glcpp_parser_parse (parser); glcpp_parser_parse (parser);
errors = parser->info_log[0] != '\0';
printf("%s", parser->info_log); printf("%s", parser->info_log);
talloc_steal(talloc_ctx, parser->output); talloc_steal(talloc_ctx, parser->output);
*shader = parser->output; *shader = parser->output;
*shader_len = strlen(parser->output); *shader_len = strlen(parser->output);
errors = parser->error;
glcpp_parser_destroy (parser); glcpp_parser_destroy (parser);
return errors; return errors;
} }