[Mesa-dev] [PATCH 2/3] mesa: Require OpenGL 2.0 for GL_POINT_SPRITE_COORD_ORIGIN

Ian Romanick idr at freedesktop.org
Fri Aug 24 08:47:43 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

The comment in the code even says this is the right thing to do.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/main/points.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index cb6ac39..eeb1b44 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,
-- 
1.7.6.5



More information about the mesa-dev mailing list