diff options
| author | Felix Kuehling <[email protected]> | 2003-12-28 15:07:38 +0000 |
|---|---|---|
| committer | Felix Kuehling <[email protected]> | 2003-12-28 15:07:38 +0000 |
| commit | 27889274101df1c2dac05e9979d3b8002663bdc6 (patch) | |
| tree | aa310c71d5e1613893448fb0da45c85f781ef85e | |
| parent | 7a57932a025cf786527d31f4951c8a6d0f25aeec (diff) | |
Fix TCL_LIGHT_MODEL_CTL setting in radeonColorMaterial.
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_state.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index be170e832e6..49d98a67e7f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -868,28 +868,28 @@ static void radeonColorMaterial( GLcontext *ctx, GLenum face, GLenum mode ) /* Default to PREMULT: */ - light_model_ctl1 &= ~((0xf << RADEON_EMISSIVE_SOURCE_SHIFT) | - (0xf << RADEON_AMBIENT_SOURCE_SHIFT) | - (0xf << RADEON_DIFFUSE_SOURCE_SHIFT) | - (0xf << RADEON_SPECULAR_SOURCE_SHIFT)); + light_model_ctl1 &= ~((3 << RADEON_EMISSIVE_SOURCE_SHIFT) | + (3 << RADEON_AMBIENT_SOURCE_SHIFT) | + (3 << RADEON_DIFFUSE_SOURCE_SHIFT) | + (3 << RADEON_SPECULAR_SOURCE_SHIFT)); if (mask & MAT_BIT_FRONT_EMISSION) { - light_model_ctl1 |= (3 << + light_model_ctl1 |= (RADEON_LM_SOURCE_VERTEX_DIFFUSE << RADEON_EMISSIVE_SOURCE_SHIFT); } if (mask & MAT_BIT_FRONT_AMBIENT) { - light_model_ctl1 |= (3 << + light_model_ctl1 |= (RADEON_LM_SOURCE_VERTEX_DIFFUSE << RADEON_AMBIENT_SOURCE_SHIFT); } if (mask & MAT_BIT_FRONT_DIFFUSE) { - light_model_ctl1 |= (3 << + light_model_ctl1 |= (RADEON_LM_SOURCE_VERTEX_DIFFUSE << RADEON_DIFFUSE_SOURCE_SHIFT); } if (mask & MAT_BIT_FRONT_SPECULAR) { - light_model_ctl1 |= (3 << + light_model_ctl1 |= (RADEON_LM_SOURCE_VERTEX_DIFFUSE << RADEON_SPECULAR_SOURCE_SHIFT); } |