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

[Tom Stellard]

Module: Mesa
Branch: 7.10
Commit: 6e08ceb77d4d4c98ea5bfd41e8fab1c3232de4a1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e08ceb77d4d4c98ea5bfd41e8fab1c3232de4a1

Author: Tom Stellard <tstellar at gmail.com>
Date:   Tue Apr  5 23:49:23 2011 -0700

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

(cherry picked from commit cd2857fae16e1352f39b37f611797e66619d3fe5)

---

 .../dri/r300/compiler/radeon_pair_schedule.c       |    3 ++-
 1 files changed, 2 insertions(+), 1 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 1a1e881..10b257c 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;
 	}