diff options
| author | Alan Hourihane <[email protected]> | 2008-11-01 22:57:26 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-11-01 22:57:26 +0000 |
| commit | 81c862205e32b163a9f5ecf3f59e4cdcccee36c6 (patch) | |
| tree | 50a5f45f1a0823758e72968d1f1dfd6e0d1098e0 /src/mesa/main/points.c | |
| parent | 14e1505cce24ee294cb98683504cc4537c20f34a (diff) | |
| parent | bbffed0857634912c7a1f13882eba303ae2bf4e1 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/main/points.c')
| -rw-r--r-- | src/mesa/main/points.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 7e189a0a8c9..1fe697033f1 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -200,7 +200,7 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params) } break; case GL_POINT_SPRITE_COORD_ORIGIN: - if (ctx->Extensions.ARB_point_sprite) { + if (ctx->Extensions.ARB_point_sprite || ctx->Extensions.NV_point_sprite) { GLenum value = (GLenum) params[0]; if (value != GL_LOWER_LEFT && value != GL_UPPER_LEFT) { _mesa_error(ctx, GL_INVALID_VALUE, |