diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
| commit | 97a1fd158c9acfaa3a8deda7eb5bf0b253e85c15 (patch) | |
| tree | 37e6c11507c1ef044aa8f0ee009136bb1d8b5bbc /src/mesa/main/texstate.c | |
| parent | 60e5fe65067da76dea816535bec1e9073adc0ba7 (diff) | |
| parent | b70f344e223fc10df8df08a6d82a813505225712 (diff) | |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 3e6b09baa1..e25c9e732c 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -550,7 +550,6 @@ update_texture_state( GLcontext *ctx ) texUnit->_Current = NULL; texUnit->_ReallyEnabled = 0x0; - texUnit->_GenFlags = 0x0; /* Get the bitmask of texture target enables. * enableBits will be a mask of the TEXTURE_*_BIT flags indicating @@ -609,6 +608,8 @@ update_texture_state( GLcontext *ctx ) for (unit = 0; unit < ctx->Const.MaxTextureCoordUnits; unit++) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; + texUnit->_GenFlags = 0x0; + if (!(ctx->Texture._EnabledCoordUnits & (1 << unit))) continue; |