diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-12 10:00:36 -0600 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 22:13:57 -0700 |
| commit | 93c90d34d10e06105984796b7b157f2a3e6db5c1 (patch) | |
| tree | 240645fcdce2141dc333d8c19a90196db430cef6 /src/mesa | |
| parent | 868c09a267f3c25591075f5a9e5d54535958632f (diff) | |
mesa: set point state
(cherry picked from commit af3d9dba562813ffed71691bffd7faf6665c4487)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/points.c | 4 | ||||
| -rw-r--r-- | src/mesa/shader/program.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 7e189a0a8c..e450b15139 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -254,7 +254,11 @@ _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++) { diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 55f862a392..b3618641e5 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -58,7 +58,11 @@ _mesa_init_program(GLcontext *ctx) #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program ctx->VertexProgram.Enabled = GL_FALSE; +#if FEATURE_es2_glsl + ctx->VertexProgram.PointSizeEnabled = GL_TRUE; +#else ctx->VertexProgram.PointSizeEnabled = GL_FALSE; +#endif ctx->VertexProgram.TwoSideEnabled = GL_FALSE; _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, ctx->Shared->DefaultVertexProgram); |