From: Stéphane Marchesin <marcheu@chromium.org>
Date: Fri, 5 Oct 2012 00:33:22 +0000 (-0700)
Subject: i915g: Don't update I915_HW_PROGRAM in update_framebuffer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98600c5ff674431fd325acec30ec42909c3ad8ed;p=mesa.git

i915g: Don't update I915_HW_PROGRAM in update_framebuffer

It's already going to be updated in update_dst_buf_vars.
---

diff --git a/src/gallium/drivers/i915/i915_state_static.c b/src/gallium/drivers/i915/i915_state_static.c
index 4d020975576..41fe2225060 100644
--- a/src/gallium/drivers/i915/i915_state_static.c
+++ b/src/gallium/drivers/i915/i915_state_static.c
@@ -151,8 +151,7 @@ static void update_framebuffer(struct i915_context *i915)
       i915->static_dirty |= I915_DST_RECT;
    }
 
-   /* we also send a new program to make sure the fixup for RGBA surfaces happens */
-   i915->hardware_dirty |= I915_HW_STATIC | I915_HW_PROGRAM;
+   i915->hardware_dirty |= I915_HW_STATIC;
 
    /* flush the cache in case we sample from the old renderbuffers */
    i915_set_flush_dirty(i915, I915_FLUSH_CACHE);
@@ -244,6 +243,7 @@ static void update_dst_buf_vars(struct i915_context *i915)
          i915->current.fixup_swizzle != fixup) {
       i915->current.target_fixup_format = need_fixup;
       i915->current.fixup_swizzle = fixup;
+      /* we also send a new program to make sure the fixup for RGBA surfaces happens */
       i915->hardware_dirty |= I915_HW_PROGRAM;
    }
 }