diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2001-05-17 09:32:17 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-05-17 09:32:17 +0000 |
commit | 89dae684aa1d74b06a4f70cb76b33671d0cef9e6 (patch) | |
tree | 9b42d5eb082a5f37920af04048cd6b8a7f20749c /src/mesa/swrast/s_pointtemp.h | |
parent | 47cf442c1164b6b406117fccfb8b564602741ee3 (diff) |
Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
Diffstat (limited to 'src/mesa/swrast/s_pointtemp.h')
-rw-r--r-- | src/mesa/swrast/s_pointtemp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h index 9711238937..be20c6bfa9 100644 --- a/src/mesa/swrast/s_pointtemp.h +++ b/src/mesa/swrast/s_pointtemp.h @@ -1,4 +1,4 @@ -/* $Id: s_pointtemp.h,v 1.7 2001/05/15 21:30:27 brianp Exp $ */ +/* $Id: s_pointtemp.h,v 1.8 2001/05/17 09:32:17 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -245,7 +245,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) sRed, sGreen, sBlue, texcoord); #elif FLAGS & TEXTURE - if (swrast->_MultiTextureEnabled) { + if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY) { PB_WRITE_MULTITEX_PIXEL(PB, x, y, z, vert->fog, red, green, blue, alpha, texcoord); @@ -292,7 +292,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) sRed, sGreen, sBlue, texcoord); #elif FLAGS & TEXTURE - if (swrast->_MultiTextureEnabled) { + if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY) { PB_WRITE_MULTITEX_PIXEL(PB, x, y, z, vert->fog, red, green, blue, alpha, texcoord ); } |