From 1409890cdb6bc917867a74835dd9d8e62346ae5e Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Sun, 18 Dec 2011 22:39:23 -0700 Subject: [PATCH] Revert 12fa91b6753dccbd3aa12c570d1f1e55c7dc0582. --- src/mesa/state_tracker/st_draw.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 87a9978..91eb584 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -544,7 +544,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx, vbuffer[attr].buffer_offset = 0; /* Track user vertex buffers. */ - pipe_resource_reference(&st->user_attrib[attr].buffer, vbuffer[attr].buffer); + pipe_resource_reference(&st->user_attrib[attr], vbuffer->buffer); st->user_attrib[attr].element_size = element_size; st->user_attrib[attr].stride = stride; st->num_user_attribs = MAX2(st->num_user_attribs, attr + 1); @@ -935,9 +935,9 @@ st_draw_vbo(struct gl_context *ctx, struct pipe_index_buffer ibuffer; struct pipe_draw_info info; unsigned i, num_instances = 1; - GLboolean new_array = - st->dirty.st && - (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) != 0; + GLboolean new_array = GL_TRUE; +/* st->dirty.st && + (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) != 0;*/ /* Mesa core state should have been validated already */ assert(ctx->NewState == 0x0); -- 1.7.4.1