From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed, 9 Jul 2008 05:08:09 +0000 (+0800)
Subject: i915: fall back to software rendering when shadow comparison is
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=75e4db18049f3284197c9a8deabd9dd74aa7920e;p=mesa.git

i915: fall back to software rendering when shadow comparison is
enabled for 1D texture. fix #12176
---

diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index af7166e681d..69c1e0755ef 100644
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -257,18 +257,15 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
        */
       if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB &&
           tObj->Target != GL_TEXTURE_3D) {
+         if (tObj->Target == GL_TEXTURE_1D) 
+            return GL_FALSE;
 
          state[I915_TEXREG_SS2] |=
             (SS2_SHADOW_ENABLE |
              intel_translate_shadow_compare_func(tObj->CompareFunc));
 
-	 if (tObj->Target == GL_TEXTURE_1D) { 
-		 minFilt = FILTER_NEAREST;
-		 magFilt = FILTER_NEAREST;
-	 } else {
-         	minFilt = FILTER_4X4_FLAT;
-         	magFilt = FILTER_4X4_FLAT;
-	 }
+         minFilt = FILTER_4X4_FLAT;
+         magFilt = FILTER_4X4_FLAT;
       }
 
       state[I915_TEXREG_SS2] |= ((minFilt << SS2_MIN_FILTER_SHIFT) |