Mesa (master): radeon: set texture bits to always emit.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: fd7fcfcc2dffb73ac3159a04ccd164b527c11a8f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd7fcfcc2dffb73ac3159a04ccd164b527c11a8f

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Nov 11 16:06:43 2011 +0000

radeon: set texture bits to always emit.

I think there is a missing state update or flush somewhere, and every
so often PP_CNTL goes to the kernel with a texture enabled but no texture.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/drivers/dri/radeon/radeon_state_init.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c
index 48929fa..eb31fe8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state_init.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c
@@ -202,10 +202,10 @@ static int check_##NM( struct gl_context *ctx, struct radeon_state_atom *atom )
 CHECK( always, GL_TRUE, 0 )
 CHECK( always_add2, GL_TRUE, 2 )
 CHECK( always_add4, GL_TRUE, 4 )
-CHECK( tex0_mm, ctx->Texture.Unit[0]._ReallyEnabled, 3 )
-CHECK( tex1_mm, ctx->Texture.Unit[1]._ReallyEnabled, 3 )
+CHECK( tex0_mm, GL_TRUE, 3 )
+CHECK( tex1_mm, GL_TRUE, 3 )
 /* need this for the cubic_map on disabled unit 2 bug, maybe r100 only? */
-CHECK( tex2_mm, ctx->Texture._EnabledUnits, 3 )
+CHECK( tex2_mm, GL_TRUE, 3 )
 CHECK( cube0_mm, (ctx->Texture.Unit[0]._ReallyEnabled & TEXTURE_CUBE_BIT), 2 + 4*5 - CUBE_STATE_SIZE )
 CHECK( cube1_mm, (ctx->Texture.Unit[1]._ReallyEnabled & TEXTURE_CUBE_BIT), 2 + 4*5 - CUBE_STATE_SIZE )
 CHECK( cube2_mm, (ctx->Texture.Unit[2]._ReallyEnabled & TEXTURE_CUBE_BIT), 2 + 4*5 - CUBE_STATE_SIZE )