From: Marek Olšák <maraeo@gmail.com>
Date: Thu, 14 Apr 2011 16:48:34 +0000 (+0200)
Subject: Revert "r300/compiler: Don't try to convert RGB to Alpha in full instructions"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2afae33f896ece1af0c8953ac9ce141c39f6dd2;p=mesa.git

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 03a16bcdbf8..8e10813ff06 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;
 	}