fix depth texture tex env bug (#719903)

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index e497f9bba76805f757e2256d68e3087c33c10f65..a47e6a72ae853848a74bba8ec3682d86216cf8a0 100644 (file)
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -1,5 +1,3 @@
-/* $Id: s_texture.c,v 1.83 2003/03/04 19:17:31 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  5.1
@@ -3811,10 +3809,12 @@ texture_apply( const GLcontext *ctx,
 
    format = texUnit->_Current->Image[baseLevel]->Format;
 
-   if (format == GL_COLOR_INDEX || format == GL_DEPTH_COMPONENT
-       || format == GL_YCBCR_MESA) {
+   if (format == GL_COLOR_INDEX || format == GL_YCBCR_MESA) {
       format = GL_RGBA;  /* a bit of a hack */
    }
+   else if (format == GL_DEPTH_COMPONENT) {
+      format = texUnit->_Current->DepthMode;
+   }
 
    switch (texUnit->EnvMode) {
       case GL_REPLACE: