Mesa (master): i965: Fix incorrect dirty bit in gen6_prepare_wm_push_constants.

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Oct 20 15:25:05 PDT 2011


Module: Mesa
Branch: master
Commit: 61d7f4b9d497780b1157492ac3958dc4c69c6c73
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=61d7f4b9d497780b1157492ac3958dc4c69c6c73

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Oct 18 17:05:28 2011 -0700

i965: Fix incorrect dirty bit in gen6_prepare_wm_push_constants.

We definitely want CACHE_NEW_WM_PROG, not CACHE_NEW_VS_PROG.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/i965/gen6_wm_state.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c
index 00fadb9..370516d 100644
--- a/src/mesa/drivers/dri/i965/gen6_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c
@@ -49,7 +49,7 @@ gen6_prepare_wm_push_constants(struct brw_context *brw)
    /* XXX: Should this happen somewhere before to get our state flag set? */
    _mesa_load_state_parameters(ctx, fp->program.Base.Parameters);
 
-   /* CACHE_NEW_VS_PROG */
+   /* CACHE_NEW_WM_PROG */
    if (brw->wm.prog_data->nr_params != 0) {
       float *constants;
       unsigned int i;
@@ -85,7 +85,7 @@ const struct brw_tracked_state gen6_wm_constants = {
       .mesa  = _NEW_PROGRAM_CONSTANTS,
       .brw   = (BRW_NEW_BATCH |
 		BRW_NEW_FRAGMENT_PROGRAM),
-      .cache = CACHE_NEW_VS_PROG,
+      .cache = CACHE_NEW_WM_PROG,
    },
    .prepare = gen6_prepare_wm_push_constants,
 };



More information about the mesa-commit mailing list