diff options
| author | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-02-09 00:36:53 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@tungstengraphics.com> | 2007-02-09 00:36:53 +0100 |
| commit | 421ce180f52ff55b866066fabd861a51dd6d2b26 (patch) | |
| tree | 0bb8b84613a0db0cf165b851d62eb3854375920f /src/mesa/drivers/dri/r200/r200_context.h | |
| parent | 54dac2c84310536cce962101de29546d3eb80175 (diff) | |
r200: simplify / unify input map handling for vp and fftnl
Use the same input map handling for fftnl and vertex programs. It doesn't
enable any new functionality (should make it easy to support per-vertex
materials though), but the code is much cleaner.
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h index 26a43d20dd..e840a502c0 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -107,8 +107,7 @@ struct r200_vertex_program { VERTEX_SHADER_INSTRUCTION instr[R200_VSF_MAX_INST + 6]; int pos_end; int inputs[VERT_ATTRIB_MAX]; - int rev_inputs[16]; - int gen_inputs_mapped; + GLubyte inputmap_rev[16]; int native; int fogpidx; int fogmode; @@ -733,14 +732,7 @@ struct r200_tcl_info { GLuint *Elts; struct r200_dma_region indexed_verts; - struct r200_dma_region weight; - struct r200_dma_region obj; - struct r200_dma_region rgba; - struct r200_dma_region spec; - struct r200_dma_region fog; - struct r200_dma_region tex[R200_MAX_TEXTURE_UNITS]; - struct r200_dma_region norm; - struct r200_dma_region generic[16]; + struct r200_dma_region vertex_data[15]; }; |