X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsoftpipe%2Fsp_state_vertex.c;h=2aee700fec28282ddd568a9e937ce9268193fde8;hb=25409c6da8163d9acb386511aef0c11577c7aadb;hp=46b6991195d80d64a9e6640557e62c407598935e;hpb=58a82ee57f1e1e67387dd860ac253223db250789;p=mesa.git

diff --git a/src/gallium/drivers/softpipe/sp_state_vertex.c b/src/gallium/drivers/softpipe/sp_state_vertex.c
index 46b6991195d..2aee700fec2 100644
--- a/src/gallium/drivers/softpipe/sp_state_vertex.c
+++ b/src/gallium/drivers/softpipe/sp_state_vertex.c
@@ -31,43 +31,92 @@
 
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_surface.h"
 
+#include "util/u_memory.h"
+#include "util/u_helpers.h"
+#include "util/u_inlines.h"
+#include "util/u_transfer.h"
 #include "draw/draw_context.h"
 
 
-void
-softpipe_set_vertex_elements(struct pipe_context *pipe,
-                             unsigned count,
-                             const struct pipe_vertex_element *attribs)
+static void *
+softpipe_create_vertex_elements_state(struct pipe_context *pipe,
+                                      unsigned count,
+                                      const struct pipe_vertex_element *attribs)
 {
-   struct softpipe_context *softpipe = softpipe_context(pipe);
-
+   struct sp_velems_state *velems;
    assert(count <= PIPE_MAX_ATTRIBS);
+   velems = (struct sp_velems_state *) MALLOC(sizeof(struct sp_velems_state));
+   if (velems) {
+      velems->count = count;
+      memcpy(velems->velem, attribs, sizeof(*attribs) * count);
+   }
+   return velems;
+}
 
-   memcpy(softpipe->vertex_element, attribs,
-          count * sizeof(struct pipe_vertex_element));
-   softpipe->num_vertex_elements = count;
+
+static void
+softpipe_bind_vertex_elements_state(struct pipe_context *pipe,
+                                    void *velems)
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+   struct sp_velems_state *sp_velems = (struct sp_velems_state *) velems;
+
+   softpipe->velems = sp_velems;
 
    softpipe->dirty |= SP_NEW_VERTEX;
 
-   draw_set_vertex_elements(softpipe->draw, count, attribs);
+   if (sp_velems)
+      draw_set_vertex_elements(softpipe->draw, sp_velems->count, sp_velems->velem);
 }
 
 
-void
+static void
+softpipe_delete_vertex_elements_state(struct pipe_context *pipe, void *velems)
+{
+   FREE( velems );
+}
+
+
+static void
 softpipe_set_vertex_buffers(struct pipe_context *pipe,
-                            unsigned count,
+                            unsigned start_slot, unsigned count,
                             const struct pipe_vertex_buffer *buffers)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
    assert(count <= PIPE_MAX_ATTRIBS);
 
-   memcpy(softpipe->vertex_buffer, buffers, count * sizeof(buffers[0]));
-   softpipe->num_vertex_buffers = count;
+   util_set_vertex_buffers_count(softpipe->vertex_buffer,
+                                 &softpipe->num_vertex_buffers,
+                                 buffers, start_slot, count);
 
    softpipe->dirty |= SP_NEW_VERTEX;
 
-   draw_set_vertex_buffers(softpipe->draw, count, buffers);
+   draw_set_vertex_buffers(softpipe->draw, start_slot, count, buffers);
+}
+
+
+static void
+softpipe_set_index_buffer(struct pipe_context *pipe,
+                          const struct pipe_index_buffer *ib)
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+
+   if (ib)
+      memcpy(&softpipe->index_buffer, ib, sizeof(softpipe->index_buffer));
+   else
+      memset(&softpipe->index_buffer, 0, sizeof(softpipe->index_buffer));
+}
+
+
+void
+softpipe_init_vertex_funcs(struct pipe_context *pipe)
+{
+   pipe->create_vertex_elements_state = softpipe_create_vertex_elements_state;
+   pipe->bind_vertex_elements_state = softpipe_bind_vertex_elements_state;
+   pipe->delete_vertex_elements_state = softpipe_delete_vertex_elements_state;
+
+   pipe->set_vertex_buffers = softpipe_set_vertex_buffers;
+   pipe->set_index_buffer = softpipe_set_index_buffer;
 }