diff options
| author | Carl Worth <cworth@cworth.org> | 2012-12-05 12:56:16 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-01-11 13:55:41 -0800 |
| commit | f8987f99720c46dda1adfff05bcb2884cac01bd8 (patch) | |
| tree | d9c04d673340c47d6c1661a27fa3729f1546bc54 /src/glsl/glcpp/pp.c | |
| parent | 4b00ecebd0019202315f0f4a9e6105d962e659f7 (diff) | |
| download | external_mesa3d-f8987f99720c46dda1adfff05bcb2884cac01bd8.zip external_mesa3d-f8987f99720c46dda1adfff05bcb2884cac01bd8.tar.gz external_mesa3d-f8987f99720c46dda1adfff05bcb2884cac01bd8.tar.bz2 | |
glcpp: Accept pointer to GL context rather than just the API version
As the preprocessor becomes more sophisticated and gains more optional
behavior, it's easiest to just pass the GL context pointer to it so that
it can examine any fields there that it needs to (such as API version,
or the state of any driconf options, etc.).
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl/glcpp/pp.c')
| -rw-r--r-- | src/glsl/glcpp/pp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c index 11b2941..5f86a49 100644 --- a/src/glsl/glcpp/pp.c +++ b/src/glsl/glcpp/pp.c @@ -151,10 +151,10 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader) int glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log, - const struct gl_extensions *extensions, int api) + const struct gl_extensions *extensions, struct gl_context *gl_ctx) { int errors; - glcpp_parser_t *parser = glcpp_parser_create (extensions, api); + glcpp_parser_t *parser = glcpp_parser_create (extensions, gl_ctx->API); *shader = remove_line_continuations(parser, *shader); glcpp_lex_set_source_string (parser, *shader); |