r300g: inline FLUSH_CS

[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 c3eb195d4e7fe469fe916a946357e28ee880e67f..906608834231854b45ad745ae0c7eca425486f95 100644 (file)
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -29,7 +29,7 @@
 struct rX00_fragment_program_code;
 struct r300_vertex_program_code;
 
-void r300_emit_aos(struct r300_context* r300, unsigned offset, boolean indexed);
+void r300_emit_aos(struct r300_context* r300, int offset, boolean indexed);
 
 void r300_emit_blend_state(struct r300_context* r300,
                            unsigned size, void* state);
@@ -76,14 +76,11 @@ void r300_emit_scissor_state(struct r300_context* r300,
 void r300_emit_textures_state(struct r300_context *r300,
                               unsigned size, void *state);
 
-void r300_emit_vertex_buffer(struct r300_context* r300);
+void r300_emit_aos_swtcl(struct r300_context *r300, boolean indexed);
 
 void r300_emit_vertex_stream_state(struct r300_context* r300,
                                    unsigned size, void* state);
 
-void r300_emit_vap_output_state(struct r300_context* r300,
-                               unsigned size, void* state);
-
 void r300_emit_vs_constants(struct r300_context* r300,
                             unsigned size, void *state);