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

[Marek Olšák]

Module: Mesa
Branch: master
Commit: d2afae33f896ece1af0c8953ac9ce141c39f6dd2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2afae33f896ece1af0c8953ac9ce141c39f6dd2

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 14 18:48:34 2011 +0200

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

This reverts commit cd2857fae16e1352f39b37f611797e66619d3fe5.

It breaks Unigine Heaven.

---

 .../dri/r300/compiler/radeon_pair_schedule.c       |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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