diff options
| author | Mathias Fröhlich <[email protected]> | 2018-01-27 16:07:22 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-02-01 22:39:06 +0100 |
| commit | 38b41fd718cfffd11dab637d9d0cbd6c2a30b2c2 (patch) | |
| tree | 24910d5640ca92b20285f40cda11279fca976468 /src/mesa/vbo/vbo_save_draw.c | |
| parent | f37e29ac224887f1b4f0cb7c61e47fb4bc6671e1 (diff) | |
mesa: Use defines for the aliased material array attributes.
Instead of just assuming that the material attributes
just overlap with the generic attributes 0-12, give
them symbolic defines so that we can easier move them
to an other range.
Signed-off-by: Mathias Fröhlich <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_save_draw.c')
| -rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 486247f7441..bbc2d0dfedf 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -151,11 +151,14 @@ bind_vertex_list(struct gl_context *ctx, /* Overlay other active attributes */ switch (get_vp_mode(ctx)) { case VP_FF: - /* Point the generic attributes at the legacy material values */ - for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) { - save->inputs[VERT_ATTRIB_GENERIC(attr)] = + for (attr = 0; attr < VERT_ATTRIB_MAT_MAX; attr++) { + save->inputs[VERT_ATTRIB_MAT(attr)] = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT+attr]; } + for (attr = VERT_ATTRIB_MAT_MAX; attr < VERT_ATTRIB_GENERIC_MAX; attr++) { + save->inputs[VERT_ATTRIB_GENERIC(attr)] = + &vbo->currval[VBO_ATTRIB_GENERIC0+attr]; + } map = vbo->map_vp_none; break; case VP_SHADER: |