Mesa (master): r300/compiler: Don' t try to convert RGB to Alpha in full instructions
Tom Stellard
tstellar at kemper.freedesktop.org
Wed Apr 6 07:33:52 UTC 2011
Module: Mesa
Branch: master
Commit: cd2857fae16e1352f39b37f611797e66619d3fe5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd2857fae16e1352f39b37f611797e66619d3fe5
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
Note: This is a candidate for the 7.10 branch.
---
.../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 8e10813..03a16bc 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;
}
More information about the mesa-commit
mailing list