From d2afae33f896ece1af0c8953ac9ce141c39f6dd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 14 Apr 2011 18:48:34 +0200 Subject: [PATCH] Revert "r300/compiler: Don't try to convert RGB to Alpha in full instructions" This reverts commit cd2857fae16e1352f39b37f611797e66619d3fe5. It breaks Unigine Heaven. --- src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 3 +-- 1 file changed, 1 insertion(+), 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; } -- 2.30.2