diff options
| author | Brian Paul <brianp@vmware.com> | 2013-07-11 17:02:37 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-07-12 08:32:51 -0600 |
| commit | 46205ab8cc03cbda6bbc0c958e277f972973ebfe (patch) | |
| tree | bd5f689a9626a410237bbfa8523c59c8299181a5 /src/gallium/drivers/r300/r300_tgsi_to_rc.c | |
| parent | f501baabdb5cd356faad0e419c64b2ac312c5756 (diff) | |
| download | external_mesa3d-46205ab8cc03cbda6bbc0c958e277f972973ebfe.zip external_mesa3d-46205ab8cc03cbda6bbc0c958e277f972973ebfe.tar.gz external_mesa3d-46205ab8cc03cbda6bbc0c958e277f972973ebfe.tar.bz2 | |
tgsi: rename the TGSI fragment kill opcodes
TGSI_OPCODE_KIL and KILP had confusing names. The former was conditional
kill (if any src component < 0). The later was unconditional kill.
At one time KILP was supposed to work with NV-style condition
codes/predicates but we never had that in TGSI.
This patch renames both opcodes:
TGSI_OPCODE_KIL -> KILL_IF (kill if src.xyzw < 0)
TGSI_OPCODE_KILP -> KILL (unconditional kill)
Note: I didn't just transpose the opcode names to help ensure that I
didn't miss updating any code anywhere.
I believe I've updated all the relevant code and comments but I'm
not 100% sure that some drivers had this right in the first place.
For example, the radeon driver might have llvm.AMDGPU.kill and
llvm.AMDGPU.kilp mixed up. Driver authors should review their code.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/drivers/r300/r300_tgsi_to_rc.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_tgsi_to_rc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c index 5e60e6c..4448f88 100644 --- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c +++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c @@ -69,7 +69,7 @@ static unsigned translate_opcode(unsigned opcode) case TGSI_OPCODE_COS: return RC_OPCODE_COS; case TGSI_OPCODE_DDX: return RC_OPCODE_DDX; case TGSI_OPCODE_DDY: return RC_OPCODE_DDY; - case TGSI_OPCODE_KILP: return RC_OPCODE_KILP; + case TGSI_OPCODE_KILL: return RC_OPCODE_KILP; /* case TGSI_OPCODE_PK2H: return RC_OPCODE_PK2H; */ /* case TGSI_OPCODE_PK2US: return RC_OPCODE_PK2US; */ /* case TGSI_OPCODE_PK4B: return RC_OPCODE_PK4B; */ @@ -136,7 +136,7 @@ static unsigned translate_opcode(unsigned opcode) /* case TGSI_OPCODE_NRM4: return RC_OPCODE_NRM4; */ /* case TGSI_OPCODE_CALLNZ: return RC_OPCODE_CALLNZ; */ /* case TGSI_OPCODE_BREAKC: return RC_OPCODE_BREAKC; */ - case TGSI_OPCODE_KIL: return RC_OPCODE_KIL; + case TGSI_OPCODE_KILL_IF: return RC_OPCODE_KIL; } fprintf(stderr, "r300: Unknown TGSI/RC opcode: %s\n", tgsi_get_opcode_name(opcode)); |