diff options
| author | Dave Airlie <[email protected]> | 2011-11-11 16:06:43 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-12-05 11:31:15 +0000 |
| commit | fd7fcfcc2dffb73ac3159a04ccd164b527c11a8f (patch) | |
| tree | ec76adaa2a7a7d8df07ca40c4196c69bcf3d353d | |
| parent | 4ed8a585840865550bb9acac38c5ef26670a1fb8 (diff) | |
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 <[email protected]>
| -rw-r--r-- | 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 48929faaa8b..eb31fe895cf 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 ) |