X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_feedback.c;h=71f48ce92feeadfbde3bdf4d0dc54df2f07046cd;hb=03c4171b577b06b1d8dde50b6eb9507d8ef4c1ce;hp=00f92d463c33f1626313b4d47d94e56dd4c7af98;hpb=cd6a31cd4a9ea6deef4778c2eaef2d47240c3a6e;p=mesa.git

diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c
index 00f92d463c3..71f48ce92fe 100644
--- a/src/mesa/swrast/s_feedback.c
+++ b/src/mesa/swrast/s_feedback.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -17,13 +16,13 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/colormac.h"
 #include "main/feedback.h"
 #include "main/macros.h"
 
@@ -37,13 +36,13 @@ static void
 feedback_vertex(struct gl_context * ctx, const SWvertex * v, const SWvertex * pv)
 {
    GLfloat win[4];
-   const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];
-   const GLfloat *color = v->attrib[FRAG_ATTRIB_COL0];
+   const GLfloat *vtc = v->attrib[VARYING_SLOT_TEX0];
+   const GLfloat *color = v->attrib[VARYING_SLOT_COL0];
 
-   win[0] = v->attrib[FRAG_ATTRIB_WPOS][0];
-   win[1] = v->attrib[FRAG_ATTRIB_WPOS][1];
-   win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;
-   win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];
+   win[0] = v->attrib[VARYING_SLOT_POS][0];
+   win[1] = v->attrib[VARYING_SLOT_POS][1];
+   win[2] = v->attrib[VARYING_SLOT_POS][2] / ctx->DrawBuffer->_DepthMaxF;
+   win[3] = 1.0F / v->attrib[VARYING_SLOT_POS][3];
 
    _mesa_feedback_vertex(ctx, win, color, vtc);
 }
@@ -114,9 +113,9 @@ _swrast_select_triangle(struct gl_context *ctx, const SWvertex *v0,
    if (!_swrast_culltriangle(ctx, v0, v1, v2)) {
       const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
 
-      _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-      _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-      _mesa_update_hitflag( ctx, v2->attrib[FRAG_ATTRIB_WPOS][2] * zs );
+      _mesa_update_hitflag( ctx, v0->attrib[VARYING_SLOT_POS][2] * zs );
+      _mesa_update_hitflag( ctx, v1->attrib[VARYING_SLOT_POS][2] * zs );
+      _mesa_update_hitflag( ctx, v2->attrib[VARYING_SLOT_POS][2] * zs );
    }
 }
 
@@ -125,8 +124,8 @@ void
 _swrast_select_line(struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1)
 {
    const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-   _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );
+   _mesa_update_hitflag( ctx, v0->attrib[VARYING_SLOT_POS][2] * zs );
+   _mesa_update_hitflag( ctx, v1->attrib[VARYING_SLOT_POS][2] * zs );
 }
 
 
@@ -134,5 +133,5 @@ void
 _swrast_select_point(struct gl_context *ctx, const SWvertex *v)
 {
    const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   _mesa_update_hitflag( ctx, v->attrib[FRAG_ATTRIB_WPOS][2] * zs );
+   _mesa_update_hitflag( ctx, v->attrib[VARYING_SLOT_POS][2] * zs );
 }