[Mesa-dev] [PATCH 26/33] i965: Do a hack job of merging VB prepare()/emit() together.

Eric Anholt eric at anholt.net
Mon Oct 24 14:17:13 PDT 2011


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.
---
 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 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,
 };
 
-- 
1.7.7



More information about the mesa-dev mailing list