diff options
| author | Karl Schultz <karl.w.schultz@gmail.com> | 2010-02-10 15:22:07 -0700 |
|---|---|---|
| committer | Karl Schultz <karl.w.schultz@gmail.com> | 2010-02-10 15:22:07 -0700 |
| commit | 2717d9066d46bff9b015f3d17dc05ce1335d0883 (patch) | |
| tree | 36970c5c3c8c0b15d2ae5ed28e348a7b927a63cd /src/mesa/drivers/dri/r300/compiler | |
| parent | 450524a87c3669e236d2801bd19aadfab91542c0 (diff) | |
| parent | 412ffb7a3ab8c0174aa921a4a10af3eaa03648da (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/r300/compiler')
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r500_fragprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c index d87acecdab..b0fb8e970b 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog.c @@ -295,7 +295,7 @@ static char *toswiz(int swiz_val) { case 2: return "B"; case 3: return "A"; case 4: return "0"; - case 5: return "1/2"; + case 5: return "H"; case 6: return "1"; case 7: return "U"; } diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c index c2eb613b23..829f028950 100644 --- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c +++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c @@ -121,8 +121,19 @@ static unsigned int translate_alpha_op(struct r300_fragment_program_compiler *c, static unsigned int fix_hw_swizzle(unsigned int swz) { - if (swz == 5) swz = 6; - if (swz == RC_SWIZZLE_UNUSED) swz = 4; + switch (swz) { + case RC_SWIZZLE_ZERO: + case RC_SWIZZLE_UNUSED: + swz = 4; + break; + case RC_SWIZZLE_HALF: + swz = 5; + break; + case RC_SWIZZLE_ONE: + swz = 6; + break; + } + return swz; } |