Mesa (master): softpipe: fix depth sampling for linear vs nearest.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 417aad5a992c8d7659438d20f82b4cf405c9c7b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=417aad5a992c8d7659438d20f82b4cf405c9c7b2

Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Dec 18 21:25:15 2011 +0000

softpipe: fix depth sampling for linear vs nearest.

This sample compare was always doing linear, and this makes the
glsl-fs-shadow1DArray test render like the Intel driver.

fix wrong 0->j from initial patch

Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/softpipe/sp_tex_sample.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
index 72629a0..43f201f 100644
--- a/src/gallium/drivers/softpipe/sp_tex_sample.c
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.c
@@ -2172,13 +2172,22 @@ sample_compare(struct tgsi_sampler *tgsi_sampler,
       break;
    }
 
-   /* convert four pass/fail values to an intensity in [0,1] */
-   val = 0.25F * (k0 + k1 + k2 + k3);
-
-   /* XXX returning result for default GL_DEPTH_TEXTURE_MODE = GL_LUMINANCE */
-   for (j = 0; j < 4; j++) {
-      rgba[0][j] = rgba[1][j] = rgba[2][j] = val;
-      rgba[3][j] = 1.0F;
+   if (sampler->mag_img_filter == PIPE_TEX_FILTER_LINEAR) {
+      /* convert four pass/fail values to an intensity in [0,1] */
+      val = 0.25F * (k0 + k1 + k2 + k3);
+
+      /* XXX returning result for default GL_DEPTH_TEXTURE_MODE = GL_LUMINANCE */
+      for (j = 0; j < 4; j++) {
+	 rgba[0][j] = rgba[1][j] = rgba[2][j] = val;
+	 rgba[3][j] = 1.0F;
+      }
+   } else {
+      for (j = 0; j < 4; j++) {
+	 rgba[0][j] = k0;
+	 rgba[1][j] = k1;
+	 rgba[2][j] = k2;
+	 rgba[3][j] = 1.0F;
+      }
    }
 }