diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-29 00:17:36 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-29 00:17:36 +0100 |
| commit | d515b895dc5151d102f33b577cafbf63473bbafa (patch) | |
| tree | 98986aec1f43152c3c5f4f8f8a19d29f88b42d83 /mesalib/src/mesa/vbo/vbo_context.c | |
| parent | ecb8be4d2a289c5308f3f23929116d2fe6aafa4b (diff) | |
| parent | 9715b7fab0757c86e1bb151f3dce0b324bcff692 (diff) | |
| download | vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.gz vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.bz2 vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_context.c')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_context.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c index b2e6bbc12..d83f2fd23 100644 --- a/mesalib/src/mesa/vbo/vbo_context.c +++ b/mesalib/src/mesa/vbo/vbo_context.c @@ -176,17 +176,14 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx ) { GLuint i; - /* When no vertex program, pull in the material attributes in - * the generic range. - */ - for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) + /* identity mapping */ + for (i = 0; i < Elements(vbo->map_vp_none); i++) vbo->map_vp_none[i] = i; + /* map material attribs to generic slots */ for (i = 0; i < NR_MAT_ATTRIBS; i++) vbo->map_vp_none[VERT_ATTRIB_GENERIC(i)] = VBO_ATTRIB_MAT_FRONT_AMBIENT + i; - for (i = NR_MAT_ATTRIBS; i < VERT_ATTRIB_GENERIC_MAX; i++) - vbo->map_vp_none[VERT_ATTRIB_GENERIC(i)] = i; - + for (i = 0; i < Elements(vbo->map_vp_arb); i++) vbo->map_vp_arb[i] = i; } |