summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-07-24 13:33:22 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-07-24 13:33:22 +0000
commit3a25e2350a110031c14921b04c49232d1d4512ff (patch)
tree7801c51df84e83e73119c0344391d38c0729ad66
parentdf03f8ed6d6ad7e35e1f17b8af2d91d694ece483 (diff)
if texture color table is enabled, use the color table's format to evaluate the texture env function
-rw-r--r--src/mesa/swrast/s_texture.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index cb12472462..172401f594 100644
--- 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: