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

This reverts commit cd2857fae16e1352f39b37f611797e66619d3fe5.

It breaks Unigine Heaven.

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 03a16bcdbf88897545789def0df8cd3402295b0f..8e10813ff069745cb1ed6c525690db83828b5acb 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,8 +600,7 @@ 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)
-           || inst->U.P.Alpha.Opcode != RC_OPCODE_NOP) {
+           || !can_remap(inst->U.P.Alpha.Opcode)) {
                reader_data->Abort = 1;
                return;
        }