OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0896457
)
fix minor glitch with GL_DEPTH_COMPONENT textures
author
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 10 Apr 2004 19:50:33 +0000
(19:50 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 10 Apr 2004 19:50:33 +0000
(19:50 +0000)
src/mesa/main/texstate.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texstate.c
b/src/mesa/main/texstate.c
index
b320437
..
a926ff1
100644
(file)
--- a/
src/mesa/main/texstate.c
+++ b/
src/mesa/main/texstate.c
@@
-2946,7
+2946,7
@@
update_texture_state( GLcontext *ctx )
if (texUnit->_ReallyEnabled)
ctx->Texture._EnabledUnits |= (1 << unit);
- if (
texUnit->EnvMode == GL_COMBINE
) {
+ if (
texUnit->EnvMode == GL_COMBINE
) {
texUnit->_CurrentCombine = & texUnit->Combine;
}
else {
@@
-2954,6
+2954,9
@@
update_texture_state( GLcontext *ctx )
if (format == GL_COLOR_INDEX) {
format = GL_RGBA; /* a bit of a hack */
}
+ else if (format == GL_DEPTH_COMPONENT) {
+ format = texUnit->_Current->DepthMode;
+ }
calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
texUnit->_CurrentCombine = & texUnit->_EnvMode;
}