From 732c3a90a409aa5972c70f5ea333cbecec508c41 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 6 Jan 2019 20:22:15 -0800 Subject: [PATCH] iris: Fix bug in bound vertex buffer tracking res might be NULL, at which point this is an unbind. --- src/gallium/drivers/iris/iris_state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index b12a77885bf..e7801a698dc 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2462,13 +2462,13 @@ iris_set_vertex_buffers(struct pipe_context *ctx, assert(!buffer->is_user_buffer); - ice->state.bound_vertex_buffers |= 1ull << (start_slot + i); - pipe_resource_reference(&state->resource, buffer->buffer.resource); struct iris_resource *res = (void *) state->resource; - if (res) + if (res) { + ice->state.bound_vertex_buffers |= 1ull << (start_slot + i); res->bind_history |= PIPE_BIND_VERTEX_BUFFER; + } iris_pack_state(GENX(VERTEX_BUFFER_STATE), state->state, vb) { vb.VertexBufferIndex = start_slot + i; -- 2.30.2