diff options
| author | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
| commit | 2bf95c519e755146704f4942b1703d47d18bfeaa (patch) | |
| tree | 9d29c5d56014377013770615611f903cd5b25292 /src/mesa/state_tracker/st_draw.c | |
| parent | f36846c77ee196881c0da560229279fc7ed88170 (diff) | |
| parent | 8042d751debb7a8375e8bc587189fea9a5a8371d (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index d6e67b7fb85..40afa436292 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -429,7 +429,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx, vbuffer[attr].buffer_offset = 0; /* Track user vertex buffers. */ - pipe_resource_reference(&st->user_vb[attr], vbuffer->buffer); + pipe_resource_reference(&st->user_vb[attr], vbuffer[attr].buffer); st->user_vb_stride[attr] = stride; st->num_user_vbs = MAX2(st->num_user_vbs, attr+1); } @@ -632,10 +632,8 @@ 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 = GL_TRUE; - /* Fix this (Bug 34378): GLboolean new_array = - st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0;*/ + st->dirty.st && (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM)) != 0; /* Mesa core state should have been validated already */ assert(ctx->NewState == 0x0); |