i965: Move push constants setup to emit() time.

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

diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 202c10942d6c95a48b33f0dc418717ca31bcdb51..e06c7b452a0cf986dbf1619da8ac22f690d11e9f 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -34,7 +34,7 @@
 #include "intel_batchbuffer.h"
 
 static void
-gen6_prepare_vs_push_constants(struct brw_context *brw)
+gen6_upload_vs_push_constants(struct brw_context *brw)
 {
    struct intel_context *intel = &brw->intel;
    struct gl_context *ctx = &intel->ctx;
@@ -124,7 +124,7 @@ const struct brw_tracked_state gen6_vs_constants = {
                BRW_NEW_VERTEX_PROGRAM),
       .cache = CACHE_NEW_VS_PROG,
    },
-   .prepare = gen6_prepare_vs_push_constants,
+   .emit = gen6_upload_vs_push_constants,
 };
 
 static void
@@ -147,7 +147,7 @@ upload_vs_state(struct brw_context *brw)
                GEN6_CONSTANT_BUFFER_0_ENABLE |
                (5 - 2));
       /* Pointer to the VS constant buffer.  Covered by the set of
-       * state flags from gen6_prepare_wm_constants
+       * state flags from gen6_upload_vs_constants
        */
       OUT_BATCH(brw->vs.push_const_offset +
                brw->vs.push_const_size - 1);

diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c
index ac1b1a3cc5ed9ae8a9e8236c5f1440a6d7159287..25e0fa2909e45c7f5d0f3558e764e64f8a42edb9 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c
@@ -35,7 +35,7 @@
 #include "intel_batchbuffer.h"
 
 static void
-gen6_prepare_wm_push_constants(struct brw_context *brw)
+gen6_upload_wm_push_constants(struct brw_context *brw)
 {
    struct intel_context *intel = &brw->intel;
    struct gl_context *ctx = &intel->ctx;
@@ -87,7 +87,7 @@ const struct brw_tracked_state gen6_wm_constants = {
                BRW_NEW_FRAGMENT_PROGRAM),
       .cache = CACHE_NEW_WM_PROG,
    },
-   .prepare = gen6_prepare_wm_push_constants,
+   .emit = gen6_upload_wm_push_constants,
 };
 
 static void
@@ -118,7 +118,7 @@ upload_wm_state(struct brw_context *brw)
                GEN6_CONSTANT_BUFFER_0_ENABLE |
                (5 - 2));
       /* Pointer to the WM constant buffer.  Covered by the set of
-       * state flags from gen6_prepare_wm_constants
+       * state flags from gen6_upload_wm_constants
        */
       OUT_BATCH(brw->wm.push_const_offset +
                ALIGN(brw->wm.prog_data->nr_params,