projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
555f0a8
)
mesa: move update_texture_compare_function() call out of loop
author
Brian Paul
<brianp@vmware.com>
Sun, 1 Mar 2009 00:02:49 +0000
(17:02 -0700)
committer
Brian Paul
<brianp@vmware.com>
Mon, 2 Mar 2009 16:44:32 +0000
(09:44 -0700)
src/mesa/main/texstate.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texstate.c
b/src/mesa/main/texstate.c
index e25c9e732c303b1a75165b12b2a20877123cbae4..aded12709281065ad94a5e1cbae33e7d7395c680 100644
(file)
--- a/
src/mesa/main/texstate.c
+++ b/
src/mesa/main/texstate.c
@@
-400,7
+400,6
@@
texture_override(GLcontext *ctx,
if (texObj->_Complete) {
texUnit->_ReallyEnabled = textureBit;
texUnit->_Current = texObj;
- update_texture_compare_function(ctx, texObj);
}
}
}
@@
-582,6
+581,9
@@
update_texture_state( GLcontext *ctx )
texUnit->CurrentTex[texIndex], 1 << texIndex);
}
+ if (texUnit->_Current)
+ update_texture_compare_function(ctx, texUnit->_Current);
+
if (!texUnit->_ReallyEnabled) {
continue;
}