From f778174ea1e431a7113f12c12beb4aba9e825a9f Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 27 Jul 2012 17:40:34 -0700 Subject: [PATCH] mesa: Require OpenGL 2.0 for GL_POINT_SPRITE_COORD_ORIGIN The comment in the code even says this is the right thing to do. Signed-off-by: Ian Romanick Reviewed-by: Eric Anholt --- src/mesa/main/points.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index cb6ac3922e0..eeb1b44339c 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -190,12 +190,11 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params) } break; case GL_POINT_SPRITE_COORD_ORIGIN: - /* This is not completely correct. GL_POINT_SPRITE_COORD_ORIGIN was - * added to point sprites when the extension was merged into OpenGL - * 2.0. It is expected that an implementation supporting OpenGL 1.4 - * and GL_ARB_point_sprite will generate an error here. + /* GL_POINT_SPRITE_COORD_ORIGIN was added to point sprites when the + * extension was merged into OpenGL 2.0. */ - if (ctx->Extensions.ARB_point_sprite) { + if ((ctx->API == API_OPENGL && ctx->Version >= 20) + || ctx->API == API_OPENGL_CORE) { GLenum value = (GLenum) params[0]; if (value != GL_LOWER_LEFT && value != GL_UPPER_LEFT) { _mesa_error(ctx, GL_INVALID_VALUE, -- 2.30.2