diff options
| author | Brian Paul <[email protected]> | 2008-08-19 18:14:15 -0600 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:13:57 -0700 |
| commit | 6fd15dd80666ccb1e9b99cedd306e32cc7cee989 (patch) | |
| tree | 0bf85d86b7151e53ddc921dbc8088eda6a8abe88 /src/mesa | |
| parent | 1b7e90984511cfa47597c255d73ca416ddd2db6f (diff) | |
mesa: allow for extra per-context init
(cherry picked from commit 815cdcfbc0740c66b901361620c88d99541bdad2)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/context.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/context.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/points.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d6205fc4536..a41cb42952e 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1234,6 +1234,10 @@ _mesa_initialize_context(GLcontext *ctx, ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE; } +#ifdef FEATURE_extra_context_init + _mesa_initialize_context_extra(ctx); +#endif + ctx->FirstTimeCurrent = GL_TRUE; return GL_TRUE; diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index bb6f3acf062..54f1af911d3 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -115,6 +115,9 @@ _mesa_initialize_context( GLcontext *ctx, void *driverContext ); extern void +_mesa_initialize_context_extra(GLcontext *ctx); + +extern void _mesa_free_context_data( GLcontext *ctx ); extern void diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index e450b151398..7e189a0a8c9 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -254,11 +254,7 @@ _mesa_init_point(GLcontext *ctx) ctx->Point.MaxSize = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA); ctx->Point.Threshold = 1.0; -#if FEATURE_es2_glsl - ctx->Point.PointSprite = GL_TRUE; /* GL_ARB/NV_point_sprite */ -#else ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */ -#endif ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */ ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */ for (i = 0; i < MAX_TEXTURE_UNITS; i++) { |