r600g: disable handling of DISCARD_RANGE

[mesa.git] / src / gallium / drivers / r600 / r600_translate.c

diff --git a/src/gallium/drivers/r600/r600_translate.c b/src/gallium/drivers/r600/r600_translate.c
index fd415be6b6d885327eb4e7b6bf0f0026766ef3f3..c054c865e02a9b5ffec69d2e3afbe5490479988f 100644 (file)
--- a/src/gallium/drivers/r600/r600_translate.c
+++ b/src/gallium/drivers/r600/r600_translate.c
@@ -23,10 +23,9 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  */
 
+#include "r600_pipe.h"
 #include "util/u_index_modify.h"
-#include "util/u_inlines.h"
 #include "util/u_upload_mgr.h"
-#include "r600_pipe.h"
 
 
 void r600_translate_index_buffer(struct r600_context *r600,
@@ -39,11 +38,11 @@ void r600_translate_index_buffer(struct r600_context *r600,
 
        switch (ib->index_size) {
        case 1:
-               u_upload_alloc(r600->vbuf_mgr->uploader, 0, count * 2,
+               u_upload_alloc(r600->uploader, 0, count * 2,
                               &out_offset, &out_buffer, &ptr);
 
                util_shorten_ubyte_elts_to_userptr(
-                               &r600->context, ib->buffer, 0, ib->offset, count, ptr);
+                               &r600->context, ib, 0, ib->offset, count, ptr);
 
                pipe_resource_reference(&ib->buffer, NULL);
                ib->buffer = out_buffer;