diff options
| author | Ian Romanick <idr@us.ibm.com> | 2003-08-23 00:12:46 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2003-08-23 00:12:46 +0000 |
| commit | 63736723678ef30e7f90835cfbd48c520e39bf11 (patch) | |
| tree | 602c0f78481c85b6c3024d2cea9100cc5102e928 /src/mesa/main/texstate.c | |
| parent | 3baefe663bb15b4fd60921155de38c12ec2758c4 (diff) | |
Trivial changes to add support for GL_ARB_point_sprite, which is a
subset of GL_NV_point_sprite (which was already supported).
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 72419922eb..8110772d3c 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -534,8 +534,9 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) } } else if (target == GL_POINT_SPRITE_NV) { - /* GL_NV_point_sprite */ - if (!ctx->Extensions.NV_point_sprite) { + /* GL_ARB_point_sprite / GL_NV_point_sprite */ + if (!ctx->Extensions.NV_point_sprite + && !ctx->Extensions.ARB_point_sprite) { _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(target=0x%x)", target ); return; } @@ -806,8 +807,9 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params ) } } else if (target == GL_POINT_SPRITE_NV) { - /* GL_NV_point_sprite */ - if (!ctx->Extensions.NV_point_sprite) { + /* GL_ARB_point_sprite / GL_NV_point_sprite */ + if (!ctx->Extensions.NV_point_sprite + && !ctx->Extensions.ARB_point_sprite) { _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" ); return; } @@ -1020,8 +1022,9 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params ) } } else if (target == GL_POINT_SPRITE_NV) { - /* GL_NV_point_sprite */ - if (!ctx->Extensions.NV_point_sprite) { + /* GL_ARB_point_sprite / GL_NV_point_sprite */ + if (!ctx->Extensions.NV_point_sprite + && !ctx->Extensions.ARB_point_sprite) { _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" ); return; } |