fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Require a context in _mesa_glsl_parse_state.

Browse source 
Create a dummy context in the standalone compiler and pass it to
_mesa_glsl_parse_state.
This commit is contained in:
Chia-I Wu 2010-09-08 18:48:12 +08:00 • committed by Kenneth Graunke
parent 7e03e2b2c7
commit dc754586ca
2 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/glsl/glsl_parser_extras.cpp
View file

@ -57,63 +57,28 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct __GLcontextRec *ctx,
this->es_shader = false;
this->ARB_texture_rectangle_enable = true;
if (ctx != NULL) {
/* OpenGL ES 2.0 has different defaults from desktop GL. */
if (ctx->API == API_OPENGLES2) {
this->language_version = 100;
this->es_shader = true;
this->ARB_texture_rectangle_enable = false;
}
this->extensions = &ctx->Extensions;
this->Const.MaxLights = ctx->Const.MaxLights;
this->Const.MaxClipPlanes = ctx->Const.MaxClipPlanes;
this->Const.MaxTextureUnits = ctx->Const.MaxTextureUnits;
this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;
this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;
this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;
this->Const.MaxVaryingFloats = ctx->Const.MaxVarying * 4;
this->Const.MaxVertexTextureImageUnits = ctx->Const.MaxVertexTextureImageUnits;
this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;
this->Const.MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
this->Const.MaxFragmentUniformComponents = ctx->Const.FragmentProgram.MaxUniformComponents;
this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;
} else {
/* If there is no GL context (standalone compiler), fill in constants
* with the minimum required values.
*/
static struct gl_extensions null_extensions;
memset(&null_extensions, 0, sizeof(null_extensions));
null_extensions.ARB_draw_buffers = GL_TRUE;
null_extensions.ARB_fragment_coord_conventions = GL_TRUE;
null_extensions.EXT_texture_array = GL_TRUE;
null_extensions.NV_texture_rectangle = GL_TRUE;
this->extensions = &null_extensions;
/* 1.10 minimums. */
this->Const.MaxLights = 8;
this->Const.MaxClipPlanes = 8;
this->Const.MaxTextureUnits = 2;
/* More than the 1.10 minimum to appease parser tests taken from
* apps that (hopefully) already checked the number of coords.
*/
this->Const.MaxTextureCoords = 4;
this->Const.MaxVertexAttribs = 16;
this->Const.MaxVertexUniformComponents = 512;
this->Const.MaxVaryingFloats = 32;
this->Const.MaxVertexTextureImageUnits = 0;
this->Const.MaxCombinedTextureImageUnits = 2;
this->Const.MaxTextureImageUnits = 2;
this->Const.MaxFragmentUniformComponents = 64;
this->Const.MaxDrawBuffers = 2;
/* OpenGL ES 2.0 has different defaults from desktop GL. */
if (ctx->API == API_OPENGLES2) {
this->language_version = 100;
this->es_shader = true;
this->ARB_texture_rectangle_enable = false;
}
this->extensions = &ctx->Extensions;
this->Const.MaxLights = ctx->Const.MaxLights;
this->Const.MaxClipPlanes = ctx->Const.MaxClipPlanes;
this->Const.MaxTextureUnits = ctx->Const.MaxTextureUnits;
this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;
this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;
this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;
this->Const.MaxVaryingFloats = ctx->Const.MaxVarying * 4;
this->Const.MaxVertexTextureImageUnits = ctx->Const.MaxVertexTextureImageUnits;
this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;
this->Const.MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
this->Const.MaxFragmentUniformComponents = ctx->Const.FragmentProgram.MaxUniformComponents;
this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers;
}
const char *

47
src/glsl/main.cpp
View file

@ -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);