diff options
author | Chia-I Wu <olv@lunarg.com> | 2010-09-08 18:48:12 +0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-08 04:08:24 -0700 |
commit | dc754586ca84741b4df5b72fd235c4134816854c (patch) | |
tree | 1f52a8f7a1953f7afcd97609d44f9ffd375f40e4 /src/glsl/main.cpp | |
parent | 7e03e2b2c787657f2abe4bd362e625bd9a971c48 (diff) |
glsl: Require a context in _mesa_glsl_parse_state.
Create a dummy context in the standalone compiler and pass it to
_mesa_glsl_parse_state.
Diffstat (limited to 'src/glsl/main.cpp')
-rw-r--r-- | src/glsl/main.cpp | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 2323a204da1..982562c4bbd 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -59,6 +59,41 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type) return shader; } +static void +initialize_context(GLcontext *ctx, gl_api api) +{ + memset(ctx, 0, sizeof(*ctx)); + + ctx->API = api; + + ctx->Extensions.ARB_draw_buffers = GL_TRUE; + ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE; + ctx->Extensions.EXT_texture_array = GL_TRUE; + ctx->Extensions.NV_texture_rectangle = GL_TRUE; + + /* 1.10 minimums. */ + ctx->Const.MaxLights = 8; + ctx->Const.MaxClipPlanes = 8; + ctx->Const.MaxTextureUnits = 2; + + /* More than the 1.10 minimum to appease parser tests taken from + * apps that (hopefully) already checked the number of coords. + */ + ctx->Const.MaxTextureCoordUnits = 4; + + ctx->Const.VertexProgram.MaxAttribs = 16; + ctx->Const.VertexProgram.MaxUniformComponents = 512; + ctx->Const.MaxVarying = 8; + ctx->Const.MaxVertexTextureImageUnits = 0; + ctx->Const.MaxCombinedTextureImageUnits = 2; + ctx->Const.MaxTextureImageUnits = 2; + ctx->Const.FragmentProgram.MaxUniformComponents = 64; + + ctx->Const.MaxDrawBuffers = 2; + + ctx->Driver.NewShader = _mesa_new_shader; +} + /* Returned string will have 'ctx' as its talloc owner. */ static char * load_text_file(void *ctx, const char *file_name) @@ -123,14 +158,14 @@ const struct option compiler_opts[] = { }; void -compile_shader(struct gl_shader *shader) +compile_shader(GLcontext *ctx, struct gl_shader *shader) { struct _mesa_glsl_parse_state *state = - new(shader) _mesa_glsl_parse_state(NULL, shader->Type, shader); + new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader); const char *source = shader->Source; state->error = preprocess(state, &source, &state->info_log, - state->extensions, API_OPENGL); + state->extensions, ctx->API); if (!state->error) { _mesa_glsl_lexer_ctor(state, source); @@ -218,8 +253,6 @@ main(int argc, char **argv) GLcontext local_ctx; GLcontext *ctx = &local_ctx; - ctx->Driver.NewShader = _mesa_new_shader; - int c; int idx = 0; while ((c = getopt_long(argc, argv, "", compiler_opts, &idx)) != -1) @@ -229,6 +262,8 @@ main(int argc, char **argv) if (argc <= optind) usage_fail(argv[0]); + initialize_context(ctx, API_OPENGL); + struct gl_shader_program *whole_program; whole_program = talloc_zero (NULL, struct gl_shader_program); @@ -265,7 +300,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } - compile_shader(shader); + compile_shader(ctx, shader); if (!shader->CompileStatus) { printf("Info log for %s:\n%s\n", argv[optind], shader->InfoLog); |