summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/draw/draw_prim.c4
-rw-r--r--src/gallium/drivers/softpipe/sp_prim_vbuf.c2
-rw-r--r--src/gallium/drivers/softpipe/sp_state_derived.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_prim.c b/src/gallium/auxiliary/draw/draw_prim.c
index ff71ba9b73..888fa536ea 100644
--- a/src/gallium/auxiliary/draw/draw_prim.c
+++ b/src/gallium/auxiliary/draw/draw_prim.c
@@ -121,8 +121,6 @@ static void draw_prim_queue_flush( struct draw_context *draw )
static INLINE void fetch_and_store(struct draw_context *draw)
{
- unsigned i;
-
/* run vertex shader on vertex cache entries, four per invokation */
#if 0
{
@@ -131,6 +129,8 @@ static INLINE void fetch_and_store(struct draw_context *draw)
count * vinfo->size);
}
#elif 0
+ unsigned i;
+
draw_update_vertex_fetch(draw);
for (i = 0; i < draw->vs.queue_nr; i += 4) {
struct vertex_header *dests[4];
diff --git a/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index 184aac16f4..db0913cb2b 100644
--- a/src/gallium/drivers/softpipe/sp_prim_vbuf.c
+++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
@@ -196,7 +196,7 @@ sp_vbuf_draw_arrays(struct vbuf_render *vbr, uint start, uint nr)
struct prim_header prim;
const void *vertex_buffer = cvbr->vertex_buffer;
const unsigned vertex_size = softpipe->vertex_info_vbuf.size * sizeof(float);
- unsigned i, j;
+ unsigned i;
prim.det = 0;
prim.reset_line_stipple = 0;
diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index 10483675ea..82cb31ece7 100644
--- a/src/gallium/drivers/softpipe/sp_state_derived.c
+++ b/src/gallium/drivers/softpipe/sp_state_derived.c
@@ -71,8 +71,8 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
* simply emit the whole post-xform vertex as-is:
*/
struct vertex_info *vinfo_vbuf = &softpipe->vertex_info_vbuf;
- vinfo_vbuf->num_attribs = 0;
#if 0
+ vinfo_vbuf->num_attribs = 0;
/* special-case to allow memcpy of whole vertex */
draw_emit_vertex_attr(vinfo_vbuf, EMIT_ALL, INTERP_NONE, 0);
/* size in dwords or floats */
@@ -82,6 +82,8 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
/* for pass-through mode, we need a more explicit list of attribs */
const uint num = draw_num_vs_outputs(softpipe->draw);
uint i;
+
+ vinfo_vbuf->num_attribs = 0;
draw_emit_vertex_attr(vinfo_vbuf, EMIT_HEADER, INTERP_NONE, 0);
for (i = 0; i < num; i++) {
draw_emit_vertex_attr(vinfo_vbuf, EMIT_4F, INTERP_PERSPECTIVE, i);