diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
| commit | ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a (patch) | |
| tree | 233b818e67de2073647e46e91ac688c6b43d5917 /mesalib/src/mesa/state_tracker | |
| parent | 15a500d3edb03668b43cc6898fafcda024d0f006 (diff) | |
| download | vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.gz vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.bz2 vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.zip | |
libfontenc xserver pixman mesa git update 5 Mar 2012
font-util-1.3.0
xclock-1.0.6
libXfont-1.4.5
inputproto-2.2
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c index c4b2caccd..eb187519f 100644 --- a/mesalib/src/mesa/state_tracker/st_draw.c +++ b/mesalib/src/mesa/state_tracker/st_draw.c @@ -905,7 +905,6 @@ 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; @@ -914,7 +913,9 @@ st_validate_varrays(struct gl_context *ctx, memset(velements, 0, sizeof(struct pipe_vertex_element) * vpv->num_inputs); /* Unreference any user vertex buffers. */ - old_num_user_attribs = st->num_user_attribs; + for (i = 0; i < st->num_user_attribs; i++) { + pipe_resource_reference(&st->user_attrib[i].buffer, NULL); + } st->num_user_attribs = 0; /* @@ -953,10 +954,6 @@ 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; } @@ -1016,9 +1013,6 @@ st_draw_vbo(struct gl_context *ctx, if (st->dirty.st) { GLboolean vertDataEdgeFlags; - /* sanity check for pointer arithmetic below */ - assert(sizeof(arrays[0]->Ptr[0]) == 1); - vertDataEdgeFlags = arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj && arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj->Name; if (vertDataEdgeFlags != st->vertdata_edgeflags) { |