3 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 80c3069cf5..1dcb19babc 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -49,6 +49,9 @@ static void r600_blitter_save_states(struct r600_context *rctx)
 					rctx->vertex_elements);
 	util_blitter_save_viewport(rctx->blitter,
 					&rctx->viewport);
+	/* XXX util_blitter_save_clip(rctx->blitter, &rctx->clip); */
+	util_blitter_save_vertex_buffers(rctx->blitter, rctx->nvertex_buffer,
+					 rctx->vertex_buffer);
 }
 
 static void r600_clear(struct pipe_context *ctx, unsigned buffers,
diff --git a/src/gallium/drivers/r600/r600_helper.c b/src/gallium/drivers/r600/r600_helper.c
index 9370a5355e..e3175b627a 100644
--- a/src/gallium/drivers/r600/r600_helper.c
+++ b/src/gallium/drivers/r600/r600_helper.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <util/u_inlines.h>
-#include <util/u_format.h>
 #include "r600_screen.h"
 #include "r600d.h"
 
diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index 24746e7877..9b02ae680e 100644
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -50,7 +50,7 @@ static void r600_end_query(struct pipe_context *pipe, struct pipe_query *query)
 
 static boolean r600_get_query_result(struct pipe_context *pipe,
 					struct pipe_query *query,
-					boolean wait, uint64_t *result)
+					boolean wait, void *result)
 {
 	return TRUE;
 }