From: Eric Anholt Date: Sat, 22 Oct 2011 18:35:56 +0000 (-0700) Subject: i965: Do a hack job of merging VB prepare()/emit() together. X-Git-Tag: mesa-8.0-rc1~1383 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78a010127f3eb600fb7b145bc562b62a77af5a34;p=platform%2Fupstream%2Fmesa.git 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 Acked-by: Paul Berry --- diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 2b6dd28..112c9f0 100644 --- 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, };