KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: pass gl_context to glcpp_parser_create() 

This is a small tidy up and will be useful in the following commit.

Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>
This commit is contained in:
Timothy Arceri 2019-08-15 12:48:25 +10:00
parent 67b32190f3
commit e0fd2fa689
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/glcpp/glcpp-parse.y
View File

@ -1368,8 +1368,8 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value)
#define INITIAL_PP_OUTPUT_BUF_SIZE 4048
glcpp_parser_t *
glcpp_parser_create(const struct gl_extensions *extension_list,
glcpp_extension_iterator extensions, void *state, gl_api api)
glcpp_parser_create(struct gl_context *gl_ctx,
glcpp_extension_iterator extensions, void *state)
{
glcpp_parser_t *parser;
@ -1404,9 +1404,9 @@ glcpp_parser_create(const struct gl_extensions *extension_list,
parser->error = 0;
parser->extensions = extensions;
parser->extension_list = extension_list;
parser->extension_list = &gl_ctx->Extensions;
parser->state = state;
parser->api = api;
parser->api = gl_ctx->API;
parser->version = 0;
parser->version_set = false;

4
src/compiler/glsl/glcpp/glcpp.h
View File

@ -229,8 +229,8 @@ struct glcpp_parser {
};
glcpp_parser_t *
glcpp_parser_create(const struct gl_extensions *extension_list,
glcpp_extension_iterator extensions, void *state, gl_api api);
glcpp_parser_create(struct gl_context *gl_ctx,
glcpp_extension_iterator extensions, void *state);
int
glcpp_parser_parse (glcpp_parser_t *parser);

2
src/compiler/glsl/glcpp/pp.c
View File

@ -228,7 +228,7 @@ glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
{
int errors;
glcpp_parser_t *parser =
glcpp_parser_create(&gl_ctx->Extensions, extensions, state, gl_ctx->API);
glcpp_parser_create(gl_ctx, extensions, state);
if (! gl_ctx->Const.DisableGLSLLineContinuations)
*shader = remove_line_continuations(parser, *shader);