gallium: change set_constant_buffer to be UBO-friendly

[mesa.git] / src / gallium / drivers / r300 / r300_render_translate.c

diff --git a/src/gallium/drivers/r300/r300_render_translate.c b/src/gallium/drivers/r300/r300_render_translate.c
index dbc64ebf827fcf6bf8736ef2859a8ad7fe333f54..022e8a7fc7044adbbac18746708233f269eea9d7 100644 (file)
--- a/src/gallium/drivers/r300/r300_render_translate.c
+++ b/src/gallium/drivers/r300/r300_render_translate.c
@@ -33,50 +33,49 @@ void r300_translate_index_buffer(struct r300_context *r300,
     struct pipe_resource *out_buffer = NULL;
     unsigned out_offset;
     void *ptr;
-    boolean flushed;
 
     switch (*index_size) {
     case 1:
-        u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 2,
-                       &out_offset, &out_buffer, &flushed, &ptr);
+        u_upload_alloc(r300->uploader, 0, count * 2,
+                       &out_offset, &out_buffer, &ptr);
 
         util_shorten_ubyte_elts_to_userptr(
                 &r300->context, *index_buffer, index_offset,
                 *start, count, ptr);
 
+       *index_buffer = NULL;
         pipe_resource_reference(index_buffer, out_buffer);
         *index_size = 2;
         *start = out_offset / 2;
-        r300->validate_buffers = TRUE;
         break;
 
     case 2:
         if (index_offset) {
-            u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 2,
-                           &out_offset, &out_buffer, &flushed, &ptr);
+            u_upload_alloc(r300->uploader, 0, count * 2,
+                           &out_offset, &out_buffer, &ptr);
 
             util_rebuild_ushort_elts_to_userptr(&r300->context, *index_buffer,
                                                 index_offset, *start,
                                                 count, ptr);
 
+           *index_buffer = NULL;
             pipe_resource_reference(index_buffer, out_buffer);
             *start = out_offset / 2;
-            r300->validate_buffers = TRUE;
         }
         break;
 
     case 4:
         if (index_offset) {
-            u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 4,
-                           &out_offset, &out_buffer, &flushed, &ptr);
+            u_upload_alloc(r300->uploader, 0, count * 4,
+                           &out_offset, &out_buffer, &ptr);
 
             util_rebuild_uint_elts_to_userptr(&r300->context, *index_buffer,
                                               index_offset, *start,
                                               count, ptr);
 
+           *index_buffer = NULL;
             pipe_resource_reference(index_buffer, out_buffer);
             *start = out_offset / 4;
-            r300->validate_buffers = TRUE;
         }
         break;
     }