if texture color table is enabled, use the color table's format to evaluate the textu...

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index cb124724624a00ab58d8bed52589f66363b3a4f2..172401f594b4bff037c674ed56b77a900871ae12 100644 (file)
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -3846,6 +3846,9 @@ 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: