r300/compiler: Don't try to convert RGB to Alpha in full instructions

Note: This is a candidate for the 7.10 branch.

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 8e10813..03a16bc 100644 (file)
--- 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;
        }