diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-23 16:37:03 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-30 14:33:20 -0700 |
| commit | 741f5d58e649cbc35c0d8661616f4e718b4718f0 (patch) | |
| tree | da34a714c58d31e8ea4f54795d157d058a323c6c /src/mesa/drivers/dri/radeon/radeon_maos_verts.c | |
| parent | 2f8749af20d4bcfc976e64d4bcaef87728c54b5c (diff) | |
radeon: Drop the remaining driver usage of _ReallyEnabled.
This is kind of ugly, but I think it's worth it to finish off the last
consumers of _ReallyEnabled.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_maos_verts.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c index 03998db49f3..cb8c7b3a6ec 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c @@ -355,7 +355,8 @@ void radeonEmitArrays( struct gl_context *ctx, GLuint inputs ) if ( (ctx->Texture.Unit[unit].TexGenEnabled & (R_BIT | Q_BIT)) ) vtx |= RADEON_Q_BIT(unit); else if ((VB->AttribPtr[_TNL_ATTRIB_TEX0 + unit]->size >= 3) && - ((ctx->Texture.Unit[unit]._ReallyEnabled & (TEXTURE_CUBE_BIT)) == 0)) { + (!ctx->Texture.Unit[unit]._Current || + ctx->Texture.Unit[unit]._Current->Target != GL_TEXTURE_CUBE_MAP)) { GLuint swaptexmatcol = (VB->AttribPtr[_TNL_ATTRIB_TEX0 + unit]->size - 3); if (((rmesa->NeedTexMatrix >> unit) & 1) && (swaptexmatcol != ((rmesa->TexMatColSwap >> unit) & 1))) |