svga: Fix banded DMA upload unmap

[mesa.git] / src / gallium / drivers / svga / svga_pipe_vertex.c

diff --git a/src/gallium/drivers/svga/svga_pipe_vertex.c b/src/gallium/drivers/svga/svga_pipe_vertex.c
index 075cf5f91bf1effca6c8a2de97974e7aa8621c48..8fbe8a15d05dd8db2df337ec3e2b0b7c31fbd78b 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_vertex.c
+++ b/src/gallium/drivers/svga/svga_pipe_vertex.c
@@ -40,9 +40,10 @@
 #include "svga_screen.h"
 
 
-static void svga_set_vertex_buffers(struct pipe_context *pipe,
-                                    unsigned start_slot, unsigned count,
-                                    const struct pipe_vertex_buffer *buffers)
+static void
+svga_set_vertex_buffers(struct pipe_context *pipe,
+                        unsigned start_slot, unsigned count,
+                        const struct pipe_vertex_buffer *buffers)
 {
    struct svga_context *svga = svga_context(pipe);
 
@@ -54,15 +55,6 @@ static void svga_set_vertex_buffers(struct pipe_context *pipe,
 }
 
 
-static void svga_set_index_buffer(struct pipe_context *pipe,
-                                  const struct pipe_index_buffer *ib)
-{
-   struct svga_context *svga = svga_context(pipe);
-
-   util_set_index_buffer(&svga->curr.ib, ib);
-}
-
-
 /**
  * Does the given vertex attrib format need range adjustment in the VS?
  * Range adjustment scales and biases values from [0,1] to [-1,1].
@@ -276,6 +268,8 @@ svga_create_vertex_elements_state(struct pipe_context *pipe,
    }
 
    svga->hud.num_vertexelement_objects++;
+   SVGA_STATS_COUNT_INC(svga_screen(svga->pipe.screen)->sws,
+                        SVGA_STATS_COUNT_VERTEXELEMENT);
 
    return velems;
 }
@@ -321,12 +315,14 @@ svga_delete_vertex_elements_state(struct pipe_context *pipe, void *state)
    svga->hud.num_vertexelement_objects--;
 }
 
-void svga_cleanup_vertex_state( struct svga_context *svga )
+
+void
+svga_cleanup_vertex_state(struct svga_context *svga)
 {
    unsigned i;
-   
+
    for (i = 0 ; i < svga->curr.num_vertex_buffers; i++)
-      pipe_resource_reference(&svga->curr.vb[i].buffer, NULL);
+      pipe_vertex_buffer_unreference(&svga->curr.vb[i]);
 
    pipe_resource_reference(&svga->state.hw_draw.ib, NULL);
 
@@ -335,10 +331,10 @@ void svga_cleanup_vertex_state( struct svga_context *svga )
 }
 
 
-void svga_init_vertex_functions( struct svga_context *svga )
+void
+svga_init_vertex_functions(struct svga_context *svga)
 {
    svga->pipe.set_vertex_buffers = svga_set_vertex_buffers;
-   svga->pipe.set_index_buffer = svga_set_index_buffer;
    svga->pipe.create_vertex_elements_state = svga_create_vertex_elements_state;
    svga->pipe.bind_vertex_elements_state = svga_bind_vertex_elements_state;
    svga->pipe.delete_vertex_elements_state = svga_delete_vertex_elements_state;