2 files changed, 4 insertions, 7 deletions

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index a0386fe4b26..b7f0b24ec8c 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -241,10 +241,9 @@ void r600_upload_index_buffer(struct r600_pipe_context *rctx,
 			      struct pipe_index_buffer *ib, unsigned count)
 {
 	struct r600_resource *rbuffer = r600_resource(ib->buffer);
-	boolean flushed;
 
 	u_upload_data(rctx->vbuf_mgr->uploader, 0, count * ib->index_size,
-		      rbuffer->b.user_ptr, &ib->offset, &ib->buffer, &flushed);
+		      rbuffer->b.user_ptr, &ib->offset, &ib->buffer);
 }
 
 void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resource **rbuffer,
@@ -253,7 +252,6 @@ void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resour
 	if ((*rbuffer)->b.user_ptr) {
 		uint8_t *ptr = (*rbuffer)->b.user_ptr;
 		unsigned size = (*rbuffer)->b.b.b.width0;
-		boolean flushed;
 
 		*rbuffer = NULL;
 
@@ -271,12 +269,12 @@ void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resour
 			}
 
 			u_upload_data(rctx->vbuf_mgr->uploader, 0, size, tmpPtr, const_offset,
-				      (struct pipe_resource**)rbuffer, &flushed);
+				      (struct pipe_resource**)rbuffer);
 
 			free(tmpPtr);
 		} else {
 			u_upload_data(rctx->vbuf_mgr->uploader, 0, size, ptr, const_offset,
-				      (struct pipe_resource**)rbuffer, &flushed);
+				      (struct pipe_resource**)rbuffer);
 		}
 	} else {
 		*const_offset = 0;
diff --git a/src/gallium/drivers/r600/r600_translate.c b/src/gallium/drivers/r600/r600_translate.c
index 9159e452343..94497077cba 100644
--- a/src/gallium/drivers/r600/r600_translate.c
+++ b/src/gallium/drivers/r600/r600_translate.c
@@ -36,12 +36,11 @@ void r600_translate_index_buffer(struct r600_pipe_context *r600,
 	struct pipe_resource *out_buffer = NULL;
 	unsigned out_offset;
 	void *ptr;
-	boolean flushed;
 
 	switch (ib->index_size) {
 	case 1:
 		u_upload_alloc(r600->vbuf_mgr->uploader, 0, count * 2,
-			       &out_offset, &out_buffer, &flushed, &ptr);
+			       &out_offset, &out_buffer, &ptr);
 
 		util_shorten_ubyte_elts_to_userptr(
 				&r600->context, ib->buffer, 0, ib->offset, count, ptr);