svga: Performance fixes

[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 9f67608d5282d69e90a08fc4611cedb9f3574cab..cd38dab6ca5b37432d1bf5e69d35f1fda68977bd 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_vertex.c
+++ b/src/gallium/drivers/svga/svga_pipe_vertex.c
@@ -25,7 +25,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/u_bitmask.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_helpers.h"
 #include "util/u_inlines.h"
 #include "util/u_math.h"
@@ -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);
 
@@ -119,7 +120,6 @@ define_input_element_object(struct svga_context *svga,
                             struct svga_velems_state *velems)
 {
    SVGA3dInputElementDesc elements[PIPE_MAX_ATTRIBS];
-   enum pipe_error ret;
    unsigned i;
 
    assert(velems->count <= PIPE_MAX_ATTRIBS);
@@ -185,14 +185,8 @@ define_input_element_object(struct svga_context *svga,
 
    velems->id = util_bitmask_add(svga->input_element_object_id_bm);
 
-   ret = SVGA3D_vgpu10_DefineElementLayout(svga->swc, velems->count,
-                                           velems->id, elements);
-   if (ret != PIPE_OK) {
-      svga_context_flush(svga, NULL);
-      ret = SVGA3D_vgpu10_DefineElementLayout(svga->swc, velems->count,
-                                              velems->id, elements);
-      assert(ret == PIPE_OK);
-   }
+   SVGA_RETRY(svga, SVGA3D_vgpu10_DefineElementLayout(svga->swc, velems->count,
+                                                      velems->id, elements));
 }
 
 
@@ -292,16 +286,10 @@ svga_delete_vertex_elements_state(struct pipe_context *pipe, void *state)
    struct svga_velems_state *velems = (struct svga_velems_state *) state;
 
    if (svga_have_vgpu10(svga)) {
-      enum pipe_error ret;
-
       svga_hwtnl_flush_retry(svga);
 
-      ret = SVGA3D_vgpu10_DestroyElementLayout(svga->swc, velems->id);
-      if (ret != PIPE_OK) {
-         svga_context_flush(svga, NULL);
-         ret = SVGA3D_vgpu10_DestroyElementLayout(svga->swc, velems->id);
-         assert(ret == PIPE_OK);
-      }
+      SVGA_RETRY(svga, SVGA3D_vgpu10_DestroyElementLayout(svga->swc,
+                                                          velems->id));
 
       if (velems->id == svga->state.hw_draw.layout_id)
          svga->state.hw_draw.layout_id = SVGA3D_INVALID_ID;
@@ -314,10 +302,12 @@ 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_vertex_buffer_unreference(&svga->curr.vb[i]);
 
@@ -328,7 +318,8 @@ 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.create_vertex_elements_state = svga_create_vertex_elements_state;