projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d8d904
)
swrast: fix bad optimization check
author
Brian Paul
<brianp@vmware.com>
Wed, 11 Mar 2009 01:29:45 +0000
(19:29 -0600)
committer
Brian Paul
<brianp@vmware.com>
Thu, 2 Apr 2009 02:24:22 +0000
(20:24 -0600)
src/mesa/swrast/s_texcombine.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_texcombine.c
b/src/mesa/swrast/s_texcombine.c
index
3b7bbfe
..
ef2db0d
100644
(file)
--- a/
src/mesa/swrast/s_texcombine.c
+++ b/
src/mesa/swrast/s_texcombine.c
@@
-604,7
+604,8
@@
texture_apply( const GLcontext *ctx,
format = texUnit->_Current->DepthMode;
}
- if (texUnit->EnvMode != GL_REPLACE) {
+ /* skip chan->float conversion when not needed */
+ if (texUnit->EnvMode != GL_REPLACE || format != GL_RGBA) {
/* convert GLchan colors to GLfloat */
for (i = 0; i < n; i++) {
rgba[i][RCOMP] = CHAN_TO_FLOAT(rgbaChan[i][RCOMP]);