diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-04-16 00:39:42 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-04-16 00:43:18 -0700 |
| commit | b1a89ea1abe1c69e3e0abcdfc2b525fe7f727864 (patch) | |
| tree | 69c2040d87c89634ab93f5bb5b48548f01224efc /src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c | |
| parent | 2c5b35807eb506a1f7a4fc675f5644ae2f675d84 (diff) | |
r300/compiler: Fix texture instruction readmasks.
No immediate benefit, it was just bugging me.
Diffstat (limited to 'src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c b/src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c index cf8602e329..ffc91241ab 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c +++ b/src/mesa/drivers/dri/r300/compiler/radeon_opcodes.c @@ -26,6 +26,7 @@ */ #include "radeon_opcodes.h" +#include "radeon_program.h" #include "radeon_program_constants.h" @@ -371,10 +372,11 @@ struct rc_opcode_info rc_opcodes[MAX_RC_OPCODE] = { }; void rc_compute_sources_for_writemask( - const struct rc_opcode_info * opcode, + const struct rc_instruction *inst, unsigned int writemask, unsigned int *srcmasks) { + const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode); srcmasks[0] = 0; srcmasks[1] = 0; srcmasks[2] = 0; @@ -406,10 +408,26 @@ void rc_compute_sources_for_writemask( srcmasks[0] |= RC_MASK_XYZW; srcmasks[1] |= RC_MASK_XYZW; break; - case RC_OPCODE_TEX: case RC_OPCODE_TXB: case RC_OPCODE_TXP: - srcmasks[0] |= RC_MASK_XYZW; + srcmasks[0] |= RC_MASK_W; + /* Fall through */ + case RC_OPCODE_TEX: + switch (inst->U.I.TexSrcTarget) { + case RC_TEXTURE_1D: + srcmasks[0] |= RC_MASK_X; + break; + case RC_TEXTURE_2D: + case RC_TEXTURE_RECT: + case RC_TEXTURE_1D_ARRAY: + srcmasks[0] |= RC_MASK_XY; + break; + case RC_TEXTURE_3D: + case RC_TEXTURE_CUBE: + case RC_TEXTURE_2D_ARRAY: + srcmasks[0] |= RC_MASK_XYZ; + break; + } break; case RC_OPCODE_DST: srcmasks[0] |= RC_MASK_Y | RC_MASK_Z; |