diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2005-11-01 17:25:49 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-11-01 17:25:49 +0000 |
| commit | c3626a91cee5034528f3f92c802a8e5947ea5f92 (patch) | |
| tree | fd16d99ef237e31067e9f7a74bc2cee471bcc7e9 /src/mesa/shader/nvvertparse.c | |
| parent | 6aa6d440d9d312cb984020e746aa80c3dbf6ea2c (diff) | |
Several fp and vp tweaks:
- Renumber VERT_RESULT_* values so that they match the
numbers of the corresponding FRAG_ATTRIB_ values.
- Add ctx->VertexProgram._Current and FragmentProgram._Current
values which point to either the current client-supplied
program if enabled, or otherwise to the current mesa-internal
program. Thus this program is always the correct one for
the current state, providing that the mesa flags to turn on
automatic generation are enabled.
- Add callbacks to ctx->Driver.BindProgram() in texenvprogram.c
and t_vp_build.c so that the driver knows when the generated
program changes. This is cleaner than trying to code all the
possible _NEW_* flags into the driver, and more precise as well.
- Add a UsesKill flag to identify fragment programs with that
instruction, as these can require special treatment.
- Move the FRAG_OUTPUT values to mtypes.h, near to similar defn's.
Diffstat (limited to 'src/mesa/shader/nvvertparse.c')
| -rw-r--r-- | src/mesa/shader/nvvertparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c index c48a4cb358..24882a2897 100644 --- a/src/mesa/shader/nvvertparse.c +++ b/src/mesa/shader/nvvertparse.c @@ -288,8 +288,9 @@ static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = { }; static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = { - "HPOS", "COL0", "COL1", "BFC0", "BFC1", "FOGC", "PSIZ", - "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL + "HPOS", "COL0", "COL1", "FOGC", + "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", + "PSIZ", "BFC0", "BFC1", NULL }; /* NOTE: the order here must match opcodes in nvvertprog.h */ |