i965: Do a hack job of merging VB prepare()/emit() together.

I don't really want to touch this impenetrable code in this series, so
just call the one function from the other, since no other atom cares
about them.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 2b6dd28bfb7420ea321fc15afea4660bfdfc319c..112c9f0cbae60cf56d5edbce61cd40b9bc67830d 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -545,6 +545,8 @@ static void brw_emit_vertices(struct brw_context *brw)
    struct intel_context *intel = intel_context(ctx);
    GLuint i;
 
+   brw_prepare_vertices(brw);
+
    brw_emit_query_begin(brw);
 
    /* If the VS doesn't read any inputs (calculating vertex position from
@@ -665,7 +667,6 @@ const struct brw_tracked_state brw_vertices = {
       .brw = BRW_NEW_BATCH | BRW_NEW_VERTICES,
       .cache = CACHE_NEW_VS_PROG,
    },
-   .prepare = brw_prepare_vertices,
    .emit = brw_emit_vertices,
 };