summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
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/swrast
parent4ef9ad22ae07b861e7f7ec6448ed589b14ac15d8 (diff)
Handle GL_MAX_VERTEX_ATTRIBS_ARB in glGet*().
Define 2.0 point-sprite related tokens in glheader.h (temporary).
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_pointtemp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index 1cfdf002af..de940b355c 100644
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.1
+ * Version: 6.2
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
@@ -293,11 +293,9 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
if (ctx->Point.CoordReplace[u]) {
GLfloat s = 0.5F + (x + 0.5F - vert->win[0]) / size;
GLfloat t;
-#if GL_VERSION_2_0
if (ctx->Point.SpriteOrigin == GL_LOWER_LEFT)
t = 0.5F + (y + 0.5F - vert->win[1]) / size;
else /* GL_UPPER_LEFT */
-#endif
t = 0.5F - (y + 0.5F - vert->win[1]) / size;
span->array->texcoords[u][count][0] = s;
span->array->texcoords[u][count][1] = t;