From cd2857fae16e1352f39b37f611797e66619d3fe5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Apr 2011 23:49:23 -0700 Subject: [PATCH] r300/compiler: Don't try to convert RGB to Alpha in full instructions Note: This is a candidate for the 7.10 branch. --- src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c index 8e10813ff06..03a16bcdbf8 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c +++ b/src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c @@ -600,7 +600,8 @@ static void is_rgb_to_alpha_possible( struct rc_reader_data * reader_data = userdata; if (!can_remap(inst->U.P.RGB.Opcode) - || !can_remap(inst->U.P.Alpha.Opcode)) { + || !can_remap(inst->U.P.Alpha.Opcode) + || inst->U.P.Alpha.Opcode != RC_OPCODE_NOP) { reader_data->Abort = 1; return; } -- 2.30.2