diff options
| author | Keith Whitwell <[email protected]> | 2004-03-29 16:01:18 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2004-03-29 16:01:18 +0000 |
| commit | eeb5eeb2a62627d2a547f6739105c1418caf6d9d (patch) | |
| tree | e64305a3ea183aefd422cdfe3c07999afe6a417c /src/mesa/shader | |
| parent | 292fa335d68ba82184e46b2dce87091f85e29e46 (diff) | |
Accomodate ARB_fp XPD opcode separately from NV_fp's X2D.
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/arbfragparse.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/nvfragprog.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/shader/arbfragparse.c b/src/mesa/shader/arbfragparse.c index 46d80dd2e28..d876946a251 100644 --- a/src/mesa/shader/arbfragparse.c +++ b/src/mesa/shader/arbfragparse.c @@ -145,7 +145,7 @@ _mesa_debug_fp_inst(GLint num, struct fp_instruction *fp) case FP_OPCODE_TXP: fprintf(stderr, "FP_OPCODE_TXP"); break; - case FP_OPCODE_X2D: + case FP_OPCODE_XPD: fprintf(stderr, "FP_OPCODE_XPD"); break; default: diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 7fa2569c64b..c2365a281c1 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -2903,7 +2903,7 @@ parse_fp_instruction (GLcontext * ctx, GLubyte ** inst, case OP_XPD_SAT: fp->Saturate = 1; case OP_XPD: - fp->Opcode = FP_OPCODE_X2D; + fp->Opcode = FP_OPCODE_XPD; break; } diff --git a/src/mesa/shader/nvfragprog.h b/src/mesa/shader/nvfragprog.h index fa817d4b9cc..e83827d1a16 100644 --- a/src/mesa/shader/nvfragprog.h +++ b/src/mesa/shader/nvfragprog.h @@ -112,7 +112,8 @@ enum fp_opcode { FP_OPCODE_UP2US, /* NV_f_p only */ FP_OPCODE_UP4B, /* NV_f_p only */ FP_OPCODE_UP4UB, /* NV_f_p only */ - FP_OPCODE_X2D, /* XPD in ARB_f_p */ + FP_OPCODE_X2D, /* NV_f_p only - 2d mat mul */ + FP_OPCODE_XPD, /* ARB_f_p only - cross product */ FP_OPCODE_END /* private opcode */ }; |