summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-04-14 18:48:34 +0200
committerMarek Olšák <[email protected]>2011-04-15 05:08:00 +0200
commitd2afae33f896ece1af0c8953ac9ce141c39f6dd2 (patch)
treede708f6d7c89ef63e6d30e40216c83a75ec5929b /src/mesa/drivers/dri
parent93059225633d3e2c69087afb643f4b271545fd71 (diff)
Revert "r300/compiler: Don't try to convert RGB to Alpha in full instructions"
This reverts commit cd2857fae16e1352f39b37f611797e66619d3fe5. It breaks Unigine Heaven.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c3
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 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;
}