diff options
| author | Eric Anholt <[email protected]> | 2011-10-22 11:35:56 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-29 12:17:09 -0700 |
| commit | 78a010127f3eb600fb7b145bc562b62a77af5a34 (patch) | |
| tree | c58d63cc4e7950d81614c45a7e106d7b8072bc22 | |
| parent | bf11c9e4c1be307add4bb9355e6c0b5f4c44629f (diff) | |
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 <[email protected]>
Acked-by: Paul Berry <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 2b6dd28bfb7..112c9f0cbae 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, }; |