summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/points.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-09-13 19:58:27 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-09-13 19:58:27 +0000
commitc3912b66abb23ce2db00723a4cb79ac84ae4a086 (patch)
treea0a36e5dda38ea87d56d32c7229810d5321b9ec0 /src/mesa/main/points.c
parent4ef9ad22ae07b861e7f7ec6448ed589b14ac15d8 (diff)
downloadexternal_mesa3d-c3912b66abb23ce2db00723a4cb79ac84ae4a086.zip
external_mesa3d-c3912b66abb23ce2db00723a4cb79ac84ae4a086.tar.gz
external_mesa3d-c3912b66abb23ce2db00723a4cb79ac84ae4a086.tar.bz2
Handle GL_MAX_VERTEX_ATTRIBS_ARB in glGet*().
Define 2.0 point-sprite related tokens in glheader.h (temporary).
Diffstat (limited to 'src/mesa/main/points.c')
-rw-r--r--src/mesa/main/points.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index 5f5e010..2ffb1a4 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -5,9 +5,9 @@
/*
* Mesa 3-D graphics library
- * Version: 5.1
+ * Version: 6.2
*
- * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -229,7 +229,6 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
return;
}
break;
-#if GL_VERSION_2_0
case GL_POINT_SPRITE_COORD_ORIGIN:
if (ctx->Extensions.ARB_point_sprite) {
GLenum value = (GLenum) params[0];
@@ -249,7 +248,6 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
return;
}
break;
-#endif
default:
_mesa_error( ctx, GL_INVALID_ENUM,
"glPointParameterf[v]{EXT,ARB}(pname)" );
@@ -287,9 +285,7 @@ void _mesa_init_point( GLcontext * ctx )
ctx->Point.Threshold = 1.0;
ctx->Point.PointSprite = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */
ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
-#if GL_VERSION_2_0
ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
-#endif
for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB_point_sprite / GL_NV_point_sprite */
}