KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: don't unreference user attribs up front. 

postpone unreferences until end of function, as the ones in use will
get naturally dereferenced.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-02-09 19:44:55 +00:00
parent fd4a3d463c
commit 72931ca4b9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/state_tracker/st_draw.c
View File

@ -905,6 +905,7 @@ st_validate_varrays(struct gl_context *ctx,
unsigned num_vbuffers, num_velements;
GLuint attr;
unsigned i;
unsigned old_num_user_attribs;
/* must get these after state validation! */
vp = st->vp;
@ -913,9 +914,7 @@ st_validate_varrays(struct gl_context *ctx,
memset(velements, 0, sizeof(struct pipe_vertex_element) * vpv->num_inputs);
/* Unreference any user vertex buffers. */
for (i = 0; i < st->num_user_attribs; i++) {
pipe_resource_reference(&st->user_attrib[i].buffer, NULL);
}
old_num_user_attribs = st->num_user_attribs;
st->num_user_attribs = 0;
/*
@ -954,6 +953,10 @@ st_validate_varrays(struct gl_context *ctx,
assert(!vbuffer[attr].buffer);
}
for (i = old_num_user_attribs; i < st->num_user_attribs; i++) {
pipe_resource_reference(&st->user_attrib[i].buffer, NULL);
}
return GL_TRUE;
}