i965/gen8+: Fix the number of dwords programmed in MI_FLUSH_DW

[mesa.git] / src / mesa / drivers / dri / i965 / brw_tes_surface_state.c

diff --git a/src/mesa/drivers/dri/i965/brw_tes_surface_state.c b/src/mesa/drivers/dri/i965/brw_tes_surface_state.c
index 1982955be8f6e3894c161e633aa717ed0bf4be94..85b285d86884237b82f67b642b3dc3ac9482acc4 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_tes_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_tes_surface_state.c
@@ -41,7 +41,8 @@ brw_upload_tes_pull_constants(struct brw_context *brw)
    struct brw_stage_state *stage_state = &brw->tes.base;
 
    /* BRW_NEW_TESS_PROGRAMS */
-   struct brw_program *dp = (struct brw_program *) brw->tess_eval_program;
+   struct brw_program *dp =
+      (struct brw_program *) brw->programs[MESA_SHADER_TESS_EVAL];
 
    if (!dp)
       return;
@@ -59,7 +60,6 @@ const struct brw_tracked_state brw_tes_pull_constants = {
    .dirty = {
       .mesa = _NEW_PROGRAM_CONSTANTS,
       .brw = BRW_NEW_BATCH |
-             BRW_NEW_BLORP |
              BRW_NEW_TES_PROG_DATA |
              BRW_NEW_TESS_PROGRAMS,
    },
@@ -85,7 +85,6 @@ const struct brw_tracked_state brw_tes_ubo_surfaces = {
    .dirty = {
       .mesa = _NEW_PROGRAM,
       .brw = BRW_NEW_BATCH |
-             BRW_NEW_BLORP |
              BRW_NEW_TES_PROG_DATA |
              BRW_NEW_UNIFORM_BUFFER,
    },
@@ -96,7 +95,7 @@ static void
 brw_upload_tes_abo_surfaces(struct brw_context *brw)
 {
    /* _NEW_PROGRAM */
-   const struct gl_program *tep = brw->tess_eval_program;
+   const struct gl_program *tep = brw->programs[MESA_SHADER_TESS_EVAL];
 
    if (tep) {
       /* BRW_NEW_TES_PROG_DATA */
@@ -110,7 +109,6 @@ const struct brw_tracked_state brw_tes_abo_surfaces = {
       .mesa = _NEW_PROGRAM,
       .brw = BRW_NEW_ATOMIC_BUFFER |
              BRW_NEW_BATCH |
-             BRW_NEW_BLORP |
              BRW_NEW_TES_PROG_DATA,
    },
    .emit = brw_upload_tes_abo_surfaces,
@@ -120,7 +118,7 @@ static void
 brw_upload_tes_image_surfaces(struct brw_context *brw)
 {
    /* BRW_NEW_TESS_PROGRAMS */
-   const struct gl_program *tep = brw->tess_eval_program;
+   const struct gl_program *tep = brw->programs[MESA_SHADER_TESS_EVAL];
 
    if (tep) {
       /* BRW_NEW_TES_PROG_DATA, BRW_NEW_IMAGE_UNITS */
@@ -132,7 +130,7 @@ brw_upload_tes_image_surfaces(struct brw_context *brw)
 const struct brw_tracked_state brw_tes_image_surfaces = {
    .dirty = {
       .brw = BRW_NEW_BATCH |
-             BRW_NEW_BLORP |
+             BRW_NEW_AUX_STATE |
              BRW_NEW_IMAGE_UNITS |
              BRW_NEW_TESS_PROGRAMS |
              BRW_NEW_TES_PROG_DATA,