From: Kenneth Graunke Date: Sat, 6 Apr 2013 05:58:39 +0000 (-0700) Subject: i965: Remove brw->vb.info and struct brw_vertex_info. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79c27e7528da47567b0cbd8c6ed442216bf5de24;p=mesa.git i965: Remove brw->vb.info and struct brw_vertex_info. Nobody uses this value, so there's no need to set it. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index be1537f0876..2ef02da38c9 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -731,12 +731,6 @@ struct brw_vertex_element { unsigned int offset; }; - - -struct brw_vertex_info { - GLuint sizes[ATTRIB_BIT_DWORDS * 2]; /* sizes:2[VERT_ATTRIB_MAX] */ -}; - struct brw_query_object { struct gl_query_object Base; @@ -791,7 +785,6 @@ struct brw_context /* Summary of size and varying of active arrays, so we can check * for changes to this state: */ - struct brw_vertex_info info; unsigned int min_index, max_index; /* Offset from start of vertex buffer so we can avoid redefining diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 5705362ba7a..7195ec89179 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -270,16 +270,10 @@ static void brw_merge_inputs( struct brw_context *brw, } brw->vb.nr_buffers = 0; - memset(&brw->vb.info, 0, sizeof(brw->vb.info)); - for (i = 0; i < VERT_ATTRIB_MAX; i++) { brw->vb.inputs[i].buffer = -1; brw->vb.inputs[i].glarray = arrays[i]; brw->vb.inputs[i].attrib = (gl_vert_attrib) i; - - if (arrays[i]->StrideB != 0) - brw->vb.info.sizes[i/16] |= (brw->vb.inputs[i].glarray->Size - 1) << - ((i%16) * 2); } }