From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 11 Oct 2003 15:30:14 +0000 (+0000)
Subject: don't use color table's format to determine texture env functions
X-Git-Tag: android-x86-1.6~8026
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd29e04bd6097ad169bb841bd137ecabf3d7a3de;p=android-x86%2Fexternal-mesa.git

don't use color table's format to determine texture env functions
---

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index a196f34c275..2342179a4e6 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -3873,9 +3873,6 @@ texture_apply( const GLcontext *ctx,
    else if (format == GL_DEPTH_COMPONENT) {
       format = texUnit->_Current->DepthMode;
    }
-   else if (texUnit->ColorTableEnabled) {
-      format = texUnit->ColorTable.Format;
-   }
 
    switch (texUnit->EnvMode) {
       case GL_REPLACE: