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 af7166e681d94038252ddcd08e2136e4b5e3d46f..69c1e0755ef9b892756f7401e6277043b1e48a83 100644 (file)
--- 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) |