From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 27 Dec 2007 02:43:43 +0000 (+0800)
Subject: i915: reset swrast state after calling swrast DrawPixels.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aac2d99dc316c069faa46dd43ff034155754c6b3;p=mesa.git

i915: reset swrast state after calling swrast DrawPixels.
In order to optimize DrawPixels, the i915 texenv program isn't
applied to swrast DrawPixels in the i915 driver. This causes this
program isn't applied to any following swrast functions. Resetting
the swrast state fixes this issue.  Fix #13614
---

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 566f884be0c..d7561e70387 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@ -378,6 +378,7 @@ intelDrawPixels(GLcontext * ctx,
       ctx->FragmentProgram._Current = fpSave;
       ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
       ctx->FragmentProgram._Active = GL_TRUE;
+      _swrast_InvalidateState(ctx, _NEW_PROGRAM);
    }
    else {
       _swrast_DrawPixels( ctx, x, y, width, height, format, type,