From 63736723678ef30e7f90835cfbd48c520e39bf11 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sat, 23 Aug 2003 00:12:46 +0000 Subject: Trivial changes to add support for GL_ARB_point_sprite, which is a subset of GL_NV_point_sprite (which was already supported). --- src/mesa/main/points.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/mesa/main/points.c') diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 5d332a8e19..466be5712b 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -207,6 +207,10 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params) } break; case GL_POINT_SPRITE_R_MODE_NV: + /* This is one area where ARB_point_sprite and NV_point_sprite + * differ. In ARB_point_sprite the POINT_SPRITE_R_MODE is + * always ZERO. NV_point_sprite adds the S and R modes. + */ if (ctx->Extensions.NV_point_sprite) { GLenum value = (GLenum) params[0]; if (value != GL_ZERO && value != GL_S && value != GL_R) { @@ -260,9 +264,9 @@ void _mesa_init_point( GLcontext * ctx ) ctx->Point.MinSize = 0.0; ctx->Point.MaxSize = ctx->Const.MaxPointSize; ctx->Point.Threshold = 1.0; - ctx->Point.PointSprite = GL_FALSE; /* GL_NV_point_sprite */ - ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite */ + ctx->Point.PointSprite = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */ + ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */ for (i = 0; i < MAX_TEXTURE_UNITS; i++) { - ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_NV_point_sprite */ + ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */ } } -- cgit v1.2.3