Hide texture layout details from the state tracker.

[mesa.git] / src / mesa / state_tracker / st_cb_feedback.c

diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index 5e334e3c857a166df32d275e6dc4edbb7dae2d0e..a9fd2579a2250f973d270954b513b0708e45f467 100644 (file)
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -55,7 +55,6 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 #include "pipe/cso_cache/cso_cache.h"
-#include "vf/vf.h"
 
 #include "pipe/draw/draw_context.h"
 #include "pipe/draw/draw_private.h"
@@ -93,8 +92,9 @@ feedback_vertex(GLcontext *ctx, const struct draw_context *draw,
    const GLfloat ci = 0;
    GLuint slot;
 
+   /* Recall that Y=0=Top of window for Gallium wincoords */
    win[0] = v->data[0][0];
-   win[1] = v->data[0][1];
+   win[1] = ctx->DrawBuffer->Height - v->data[0][1];
    win[2] = v->data[0][2];
    win[3] = 1.0F / v->data[0][3];
 
@@ -104,13 +104,13 @@ feedback_vertex(GLcontext *ctx, const struct draw_context *draw,
     */
 
    slot = st->vertex_result_to_slot[VERT_RESULT_COL0];
-   if (slot)
+   if (slot != ~0)
       color = v->data[slot];
    else
       color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
 
    slot = st->vertex_result_to_slot[VERT_RESULT_TEX0];
-   if (slot)
+   if (slot != ~0)
       texcoord = v->data[slot];
    else
       texcoord = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
@@ -294,13 +294,6 @@ st_RenderMode(GLcontext *ctx, GLenum newMode )
       draw_set_rasterize_stage(draw, st->selection_stage);
       /* Plug in new vbo draw function */
       vbo->draw_prims = st_feedback_draw_vbo;
-      /* setup post-transform vertex attribs */
-      {
-         /* just emit pos as GLfloat[4] */
-         static const uint attrs[1] = { FORMAT_4F };
-         const interp_mode *interp = NULL;
-         draw_set_vertex_attributes(draw, attrs, interp, 1);
-      }
    }
    else {
       if (!st->feedback_stage)
@@ -308,19 +301,8 @@ st_RenderMode(GLcontext *ctx, GLenum newMode )
       draw_set_rasterize_stage(draw, st->feedback_stage);
       /* Plug in new vbo draw function */
       vbo->draw_prims = st_feedback_draw_vbo;
-      /* setup post-transform vertex attribs */
-      {
-         /* emit all attribs as GLfloat[4] */
-         uint attrs[PIPE_MAX_SHADER_OUTPUTS];
-         interp_mode interp[PIPE_MAX_SHADER_OUTPUTS];
-         GLuint n = st->state.vs->state.num_outputs;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            attrs[i] = FORMAT_4F;
-            interp[i] = INTERP_NONE;
-         }
-         draw_set_vertex_attributes(draw, attrs, interp, n);
-      }
+      /* need to generate/use a vertex program that emits pos/color/tex */
+      st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
    }
 }