From c8cfbf7c19d7c3c213d5b48e1ef5ce5c19d3a656 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 21 Mar 2001 16:04:49 +0000
Subject: [PATCH] minor re-org in sample_depth_texture()

---
 src/mesa/swrast/s_texture.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index a6ae844334e..6bbf4821197 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -1,4 +1,4 @@
-/* $Id: s_texture.c,v 1.16 2001/03/15 16:45:30 brianp Exp $ */
+/* $Id: s_texture.c,v 1.17 2001/03/21 16:04:49 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2405,19 +2405,19 @@ sample_depth_texture(const GLcontext *ctx,
          COMPUTE_NEAREST_TEXEL_LOCATION(texObj->WrapS, s[i], width, col);
          COMPUTE_NEAREST_TEXEL_LOCATION(texObj->WrapT, t[i], height, row);
          depthSample = *((const GLfloat *) texImage->Data + row * width + col);
-         if ((depthSample <= r[i] && lequal) ||
-             (depthSample >= r[i] && gequal)) {
-            texel[i][RCOMP] = ambient;
-            texel[i][GCOMP] = ambient;
-            texel[i][BCOMP] = ambient;
-            texel[i][ACOMP] = CHAN_MAX;
-         }
-         else {
+         if ((r[i] <= depthSample && lequal) ||
+             (r[i] >= depthSample && gequal)) {
             texel[i][RCOMP] = CHAN_MAX;
             texel[i][GCOMP] = CHAN_MAX;
             texel[i][BCOMP] = CHAN_MAX;
             texel[i][ACOMP] = CHAN_MAX;
          }
+         else {
+            texel[i][RCOMP] = ambient;
+            texel[i][GCOMP] = ambient;
+            texel[i][BCOMP] = ambient;
+            texel[i][ACOMP] = CHAN_MAX;
+         }
       }
    }
    else {
-- 
2.30.2