summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-05-11 08:39:18 -0600
committerBrian <brian@yutani.localnet.net>2007-05-11 08:39:18 -0600
commit6c342ad8593c3b2fe5162aeb2db8c309c15b2faf (patch)
tree084fbb1115cbf3b3cef04876ddcbd494adea99f6 /src/mesa/swrast
parent86e4f52f3c0f79592c49f7fb4182b500b15431d7 (diff)
When feeding back texcoords, don't divide by W. See bug 10913.
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_feedback.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c
index 5d3fbdfeb6..32a5d3df71 100644
--- a/src/mesa/swrast/s_feedback.c
+++ b/src/mesa/swrast/s_feedback.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 7.0
*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2007 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"),
@@ -48,7 +48,6 @@ static void feedback_vertex( GLcontext *ctx,
{
GLfloat win[4];
GLfloat color[4];
- GLfloat tc[4];
const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];
win[0] = v->win[0];
@@ -61,18 +60,7 @@ static void feedback_vertex( GLcontext *ctx,
color[2] = CHAN_TO_FLOAT(pv->color[2]);
color[3] = CHAN_TO_FLOAT(pv->color[3]);
- if (vtc[3] != 1.0 && vtc[3] != 0.0) {
- GLfloat invq = 1.0F / vtc[3];
- tc[0] = vtc[0] * invq;
- tc[1] = vtc[1] * invq;
- tc[2] = vtc[2] * invq;
- tc[3] = vtc[3];
- }
- else {
- COPY_4V(tc, vtc);
- }
-
- _mesa_feedback_vertex( ctx, win, color, (GLfloat) v->index, tc );
+ _mesa_feedback_vertex( ctx, win, color, (GLfloat) v->index, vtc );
}