fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vbo: remove vbo_context::mat_currval

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
This commit is contained in:
Marek Olšák 2012-04-16 16:41:09 +02:00
parent 8c990de0d6
commit 97e2f625b8
5 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/vbo/vbo_context.c
View file

@ -104,7 +104,8 @@ static void init_generic_currval(struct gl_context *ctx)
static void init_mat_currval(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
struct gl_client_array *arrays = vbo->mat_currval;
struct gl_client_array *arrays =
&vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
GLuint i;
ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
@ -160,10 +161,6 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx )
return GL_FALSE;
}
/* TODO: remove these pointers.
*/
vbo->mat_currval = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
init_legacy_currval( ctx );
init_generic_currval( ctx );
init_mat_currval( ctx );

4
src/mesa/vbo/vbo_context.h
View file

@ -61,10 +61,6 @@
struct vbo_context {
struct gl_client_array currval[VBO_ATTRIB_MAX];
/* These point into the above. TODO: remove.
*/
struct gl_client_array *mat_currval;
/** Map VERT_ATTRIB_x to VBO_ATTRIB_y */
GLuint map_vp_none[VERT_ATTRIB_MAX];
GLuint map_vp_arb[VERT_ATTRIB_MAX];

3
src/mesa/vbo/vbo_exec_array.c
View file

@ -426,7 +426,8 @@ recalculate_input_bindings(struct gl_context *ctx)
}
for (i = 0; i < MAT_ATTRIB_MAX; i++) {
inputs[VERT_ATTRIB_GENERIC(i)] = &vbo->mat_currval[i];
inputs[VERT_ATTRIB_GENERIC(i)] =
&vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT+i];
const_inputs |= VERT_BIT_GENERIC(i);
}

3
src/mesa/vbo/vbo_exec_draw.c
View file

@ -178,7 +178,8 @@ vbo_exec_bind_arrays( struct gl_context *ctx )
}
for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
ASSERT(VERT_ATTRIB_GENERIC(attr) < Elements(exec->vtx.inputs));
exec->vtx.inputs[VERT_ATTRIB_GENERIC(attr)] = &vbo->mat_currval[attr];
exec->vtx.inputs[VERT_ATTRIB_GENERIC(attr)] =
&vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT+attr];
}
map = vbo->map_vp_none;
break;

3
src/mesa/vbo/vbo_save_draw.c
View file

@ -150,7 +150,8 @@ static void vbo_bind_vertex_list(struct gl_context *ctx,
save->inputs[attr] = &vbo->currval[VBO_ATTRIB_POS+attr];
}
for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
save->inputs[VERT_ATTRIB_GENERIC(attr)] = &vbo->mat_currval[attr];
save->inputs[VERT_ATTRIB_GENERIC(attr)] =
&vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT+attr];
}
map = vbo->map_vp_none;
break;