Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / drivers / r300 / r300_emit.h

diff --git a/src/gallium/drivers/r300/r300_emit.h b/src/gallium/drivers/r300/r300_emit.h
index c4002b8e5d00efa5dbca087d285899e888eb9c4a..b62aa9fec50c929b13baeb2d5aaa5efbac71f68b 100644 (file)
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -58,8 +58,7 @@ void r300_emit_fb_state(struct r300_context* r300,
 
 void r300_emit_query_begin(struct r300_context* r300,
                            struct r300_query* query);
-void r300_emit_query_end(struct r300_context* r300,
-                         struct r300_query* query);
+void r300_emit_query_end(struct r300_context* r300);
 
 void r300_emit_rs_state(struct r300_context* r300, struct r300_rs_state* rs);