diff options
| author | Tom Stellard <tstellar@gmail.com> | 2010-06-15 01:42:06 -0700 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-07-03 04:27:09 +0200 |
| commit | 82d0602c1f8a1f83fba948c5f04f72e01f517681 (patch) | |
| tree | b1eb96bd8260380cb6425de968d61c1a252a0c13 | |
| parent | 1732751242fe0e05c02dfbc8ef5b386fbedc044e (diff) | |
r300/compiler: Enable hardware IF statements for r500 cards.
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_reg.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c index 31f556a96a..147b0710db 100644 --- a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c @@ -111,9 +111,10 @@ void r3xx_compile_fragment_program(struct r300_fragment_program_compiler* c) debug_program_log(c, "after transform loops"); - rc_emulate_branches(&c->Base); - - debug_program_log(c, "after emulate branches"); + if (!c->Base.is_r500){ + rc_emulate_branches(&c->Base); + debug_program_log(c, "after emulate branches"); + } if (c->Base.is_r500) { struct radeon_program_transformation transformations[] = { diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h index ac93563ed9..f25264b6f2 100644 --- a/src/mesa/drivers/dri/r300/r300_reg.h +++ b/src/mesa/drivers/dri/r300/r300_reg.h @@ -3066,8 +3066,8 @@ enum { # define R500_FC_B_OP0_NONE (0 << 24) # define R500_FC_B_OP0_DECR (1 << 24) # define R500_FC_B_OP0_INCR (2 << 24) -# define R500_FC_B_OP1_DECR (0 << 26) -# define R500_FC_B_OP1_NONE (1 << 26) +# define R500_FC_B_OP1_NONE (0 << 26) +# define R500_FC_B_OP1_DECR (1 << 26) # define R500_FC_B_OP1_INCR (2 << 26) # define R500_FC_IGNORE_UNCOVERED (1 << 28) #define R500_US_FC_INT_CONST_0 0x4c00 |