projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d98fdad
)
fixed computation of _MultiTextureEnabled (again)
author
Brian Paul
<brian.paul@tungstengraphics.com>
Mon, 29 Jan 2001 21:47:13 +0000
(21:47 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Mon, 29 Jan 2001 21:47:13 +0000
(21:47 +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 ca7cbfd8458859c4427ce01466c9edd52f30914f..55966a95a869e008721540d7a1175409d3ed2f6e 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.1
1 2001/01/23 23:39:37
brianp Exp $ */
+/* $Id: s_context.c,v 1.1
2 2001/01/29 21:47:13
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 &
-
~TEXTURE0_ANY)
;
+ swrast->_MultiTextureEnabled =
+
ctx->Texture._ReallyEnabled > TEXTURE0_ANY
;
if (swrast->NewState & _NEW_POLYGON)
_swrast_update_polygon( ctx );