diff options
| author | Ben Skeggs <[email protected]> | 2008-09-11 06:09:05 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-09-11 06:09:05 +1000 |
| commit | 7158203b081ad34c03382f07e0df748eae235e9b (patch) | |
| tree | ee61efebbafb5464ec090c21b5e05533588789a1 /src/mesa/main/points.c | |
| parent | 02025148c28d03d644e3d66dde1a423fe21e1c44 (diff) | |
| parent | eb5b16d278e0f7ee0121049e43dfee1d52f2b0f7 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Diffstat (limited to 'src/mesa/main/points.c')
| -rw-r--r-- | src/mesa/main/points.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index d16344a42c3..fbedbcb22c4 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -244,11 +244,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++) { |