diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/compiler/radeon_compiler.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/compiler/radeon_program_tex.c | 13 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/gallium/drivers/r300/compiler/radeon_compiler.h b/src/gallium/drivers/r300/compiler/radeon_compiler.h index d42cee9cce1..f78a51c19c3 100644 --- a/src/gallium/drivers/r300/compiler/radeon_compiler.h +++ b/src/gallium/drivers/r300/compiler/radeon_compiler.h @@ -114,7 +114,6 @@ struct r300_fragment_program_compiler { struct rX00_fragment_program_code *code; /* Optional transformations and features. */ struct r300_fragment_program_external_state state; - unsigned enable_shadow_ambient; /* Register corresponding to the depthbuffer. */ unsigned OutputDepth; /* Registers corresponding to the four colorbuffers. */ diff --git a/src/gallium/drivers/r300/compiler/radeon_program_tex.c b/src/gallium/drivers/r300/compiler/radeon_program_tex.c index 9d69ebd18fb..8dfcd54d238 100644 --- a/src/gallium/drivers/r300/compiler/radeon_program_tex.c +++ b/src/gallium/drivers/r300/compiler/radeon_program_tex.c @@ -37,17 +37,8 @@ static struct rc_src_register shadow_fail_value(struct r300_fragment_program_com { struct rc_src_register reg = { 0, 0, 0, 0, 0, 0 }; - if (compiler->enable_shadow_ambient) { - reg.File = RC_FILE_CONSTANT; - reg.Index = rc_constants_add_state(&compiler->Base.Program.Constants, - RC_STATE_SHADOW_AMBIENT, tmu); - reg.Swizzle = RC_SWIZZLE_WWWW; - } else { - reg.File = RC_FILE_NONE; - reg.Swizzle = RC_SWIZZLE_0000; - } - - reg.Swizzle = combine_swizzles(reg.Swizzle, + reg.File = RC_FILE_NONE; + reg.Swizzle = combine_swizzles(RC_SWIZZLE_0000, compiler->state.unit[tmu].texture_swizzle); return reg; } |