projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab6e78f
)
_MultiTextureEnabled was being computed incorrectly
author
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 9 Dec 2000 22:09:50 +0000
(22:09 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 9 Dec 2000 22:09:50 +0000
(22:09 +0000)
src/mesa/swrast/s_context.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_context.c
b/src/mesa/swrast/s_context.c
index 6192adb26389a8501b848da0979a87680d25c8da..001778494778c94b94f8e8d154e65e9b5cde92f3 100644
(file)
--- a/
src/mesa/swrast/s_context.c
+++ b/
src/mesa/swrast/s_context.c
@@
-1,4
+1,4
@@
-/* $Id: s_context.c,v 1.
6 2000/11/22 07:32:18 joukj
Exp $ */
+/* $Id: s_context.c,v 1.
7 2000/12/09 22:09:50 brianp
Exp $ */
/*
* Mesa 3-D graphics library
@@
-326,8
+326,8
@@
_swrast_validate_derived( GLcontext *ctx )
_swrast_update_rasterflags( ctx );
if (swrast->NewState & _NEW_TEXTURE)
- swrast->_MultiTextureEnabled =
(ctx->Texture._ReallyEnabled &
-
~
ENABLE_TEX0);
+ swrast->_MultiTextureEnabled =
+
(ctx->Texture._ReallyEnabled >
ENABLE_TEX0);
if (swrast->NewState & _NEW_POLYGON)
_swrast_update_polygon( ctx );