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

glcpp: Print to the main compiler's infolog, not stdout.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-06-21 11:47:55 -07:00
parent 4a2bbdacfc
commit 74704e80c6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glcpp/pp.c
View File

@@ -57,7 +57,7 @@ glcpp_warning (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
} }
extern int extern int
preprocess(void *talloc_ctx, const char **shader) preprocess(void *talloc_ctx, const char **shader, char **info_log)
{ {
int errors; int errors;
glcpp_parser_t *parser = glcpp_parser_create (); glcpp_parser_t *parser = glcpp_parser_create ();
@@ -65,7 +65,7 @@ preprocess(void *talloc_ctx, const char **shader)
glcpp_parser_parse (parser); glcpp_parser_parse (parser);
printf("%s", parser->info_log); *info_log = talloc_strdup_append(*info_log, parser->info_log);
talloc_steal(talloc_ctx, parser->output); talloc_steal(talloc_ctx, parser->output);
*shader = parser->output; *shader = parser->output;

2
glsl_parser_extras.h
View File

@@ -102,7 +102,7 @@ extern void _mesa_glsl_warning(const YYLTYPE *locp,
const char *fmt, ...); const char *fmt, ...);
extern "C" { extern "C" {
extern int preprocess(void *ctx, const char **shader); extern int preprocess(void *ctx, const char **shader, char **info_log);
} }
extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state, extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,

2
main.cpp
View File

@@ -128,7 +128,7 @@ compile_shader(struct glsl_shader *shader)
* should probably be the parser context, but there isn't one yet. * should probably be the parser context, but there isn't one yet.
*/ */
const char *source = shader->Source; const char *source = shader->Source;
state.error = preprocess(shader, &source); state.error = preprocess(shader, &source, &state.info_log);
if (!state.error) { if (!state.error) {
_mesa_glsl_lexer_ctor(& state, source); _mesa_glsl_lexer_ctor(& state, source);