aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2011-04-05 23:49:23 -0700
committerTom Stellard <[email protected]>2011-04-06 00:31:53 -0700
commitcd2857fae16e1352f39b37f611797e66619d3fe5 (patch)
tree3286c4264397561a44212f590741e0b08aa30508 /src/mesa
parent740282b417caca6c1f223f488ee9a6f9bff81164 (diff)
r300/compiler: Don't try to convert RGB to Alpha in full instructions
Note: This is a candidate for the 7.10 branch.
Diffstat (limited to 'src/mesa')
-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 8e10813ff06..03a16bcdbf8 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;
}