diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
| commit | aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch) | |
| tree | 37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /mesalib/src/mesa/main/ffvertex_prog.c | |
| parent | 2e0adb33e03e3142f1412ed570415c5ce616dcef (diff) | |
| parent | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff) | |
| download | vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2 vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_util.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/mesa/main/ffvertex_prog.c')
| -rw-r--r-- | mesalib/src/mesa/main/ffvertex_prog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index c5583c965..728cf968b 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -233,13 +233,13 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) if (ctx->Texture._TexGenEnabled || ctx->Texture._TexMatEnabled || - ctx->Texture._EnabledUnits) + ctx->Texture._MaxEnabledTexImageUnit != -1) key->texture_enabled_global = 1; for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; - if (texUnit->_ReallyEnabled) + if (texUnit->_Current) key->unit[i].texunit_really_enabled = 1; if (ctx->Point.PointSprite) |