svga: Silence warning

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

diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c
index d53edcb23c534de320e9f880a5cf1c823e7e3a8d..541a2340159a52906a3a3df4af1217f2fe18470c 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_draw.c
+++ b/src/gallium/drivers/svga/svga_pipe_draw.c
@@ -138,7 +138,6 @@ svga_upload_user_buffers(struct svga_context *svga,
 
       if (vb->buffer && svga_buffer_is_user_buffer(vb->buffer)) {
          struct svga_buffer *buffer = svga_buffer(vb->buffer);
-         boolean flushed;
 
          /*
           * Check if already uploaded. Otherwise go ahead and upload.
@@ -153,8 +152,7 @@ svga_upload_user_buffers(struct svga_context *svga,
                                 buffer->uploaded.end - buffer->uploaded.start,
                                 &buffer->b.b,
                                 &buffer->uploaded.offset,
-                                &buffer->uploaded.buffer,
-                                &flushed);
+                                &buffer->uploaded.buffer);
 
          if (ret)
             return ret;
@@ -226,7 +224,7 @@ retry_draw_range_elements( struct svga_context *svga,
                            unsigned instance_count,
                            boolean do_retry )
 {
-   enum pipe_error ret = 0;
+   enum pipe_error ret = PIPE_OK;
 
    svga_hwtnl_set_unfilled( svga->hwtnl,
                             svga->curr.rast->hw_unfilled );
@@ -241,14 +239,14 @@ retry_draw_range_elements( struct svga_context *svga,
       goto retry;
 
    ret = svga_update_state( svga, SVGA_STATE_HW_DRAW );
-   if (ret)
+   if (ret != PIPE_OK)
       goto retry;
 
    ret = svga_hwtnl_draw_range_elements( svga->hwtnl,
                                          index_buffer, index_size, index_bias,
                                          min_index, max_index,
                                          prim, start, count );
-   if (ret)
+   if (ret != PIPE_OK)
       goto retry;
 
    return PIPE_OK;
@@ -292,12 +290,12 @@ retry_draw_arrays( struct svga_context *svga,
       goto retry;
 
    ret = svga_update_state( svga, SVGA_STATE_HW_DRAW );
-   if (ret)
+   if (ret != PIPE_OK)
       goto retry;
 
    ret = svga_hwtnl_draw_arrays( svga->hwtnl, prim,
                                  start, count );
-   if (ret)
+   if (ret != PIPE_OK)
       goto retry;
 
    return 0;
@@ -401,6 +399,9 @@ svga_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
       }
    }
 
+   /* XXX: Silence warnings, do something sensible here? */
+   (void)ret;
+
    svga_release_user_upl_buffers( svga );
 
    if (SVGA_DEBUG & DEBUG_FLUSH) {