diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-17 10:26:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-17 10:26:33 +1000 |
| commit | 7a1dbcabf3f2599c90665e7fdbdba8698528841a (patch) | |
| tree | 189c6513c0815fc55f9d6c970ffe75bfca690d26 | |
| parent | 5325f8624093bb1ec30d581b4ff64218ceab99f9 (diff) | |
radeon: move YUV on first texunit check after hw state is setup
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texstate.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c index 1aa5f980ce..0dc355723e 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texstate.c +++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c @@ -985,15 +985,14 @@ static GLboolean radeon_validate_texture(GLcontext *ctx, struct gl_texture_objec if (!radeon_validate_texture_miptree(ctx, texObj)) return GL_FALSE; - /* yuv conversion only works in first unit */ - if (unit != 0 && (t->pp_txfilter & RADEON_YUV_TO_RGB)) - return GL_FALSE; - - ret = setup_hardware_state(rmesa, t, unit); if (ret == GL_FALSE) return GL_FALSE; + /* yuv conversion only works in first unit */ + if (unit != 0 && (t->pp_txfilter & RADEON_YUV_TO_RGB)) + return GL_FALSE; + RADEON_STATECHANGE( rmesa, ctx ); rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= (RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE) << unit; |