diff options
| author | Brian Paul <[email protected]> | 2008-11-06 17:17:13 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-06 17:17:13 -0700 |
| commit | c417a2c3f37a6a28947db5dc5aa240473d29dd19 (patch) | |
| tree | bab80cca9ac88f9951999a1f74e261dea7471db2 /src/mesa/shader/prog_instruction.h | |
| parent | a7d9fde24cb8ecc59b0a6fc610135d851806295b (diff) | |
| parent | 035c0cf71a5fe3beee55654e1f7148adfe626cc0 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 711166f9ddb..2be39ac6244 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -173,7 +173,6 @@ typedef enum prog_opcode { OPCODE_FLR, /* X X 2 X X */ OPCODE_FRC, /* X X 2 X X */ OPCODE_IF, /* opt */ - OPCODE_INT, /* X */ OPCODE_KIL, /* X */ OPCODE_KIL_NV, /* X X */ OPCODE_LG2, /* X X 2 X X */ @@ -221,6 +220,7 @@ typedef enum prog_opcode { OPCODE_TXL, /* 3 2 X */ OPCODE_TXP, /* X X */ OPCODE_TXP_NV, /* 3 X */ + OPCODE_TRUNC, /* X */ OPCODE_UP2H, /* X */ OPCODE_UP2US, /* X */ OPCODE_UP4B, /* X */ @@ -231,6 +231,9 @@ typedef enum prog_opcode { } gl_inst_opcode; +/* temporary, just in case, remove soon */ +#define OPCODE_INT OPCODE_TRUNC + /** * Instruction source register. */ |