summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2011-04-05 23:49:23 -0700
committerTom Stellard <[email protected]>2011-04-06 00:41:29 -0700
commit6e08ceb77d4d4c98ea5bfd41e8fab1c3232de4a1 (patch)
treeaaf20527071837fd39800c8e684d1e30e37b39d4
parent50dccfdbefcf0a5c35668287508916a3a74da4c8 (diff)
r300/compiler: Don't try to convert RGB to Alpha in full instructions
(cherry picked from commit cd2857fae16e1352f39b37f611797e66619d3fe5)
-rw-r--r--src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c3
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 1a1e881685a..10b257cc9f2 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;
}