diff options
| author | Kenneth Graunke <[email protected]> | 2019-06-26 23:56:45 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-06-27 08:12:22 -0700 |
| commit | d6683e118fa9b4da8f366e1034b48276ff5146c2 (patch) | |
| tree | 3a38d28405b533ac4f5eab2ec30b3a72f8606ae6 | |
| parent | 340df53d6a9dea21a968bb040232ffa66db53add (diff) | |
iris: Also properly restore INTERFACE_DESCRIPTOR_DATA buffer object
We were at least cleaning up this reference, but we were failing to
pin it in iris_restore_compute_saved_bos.
| -rw-r--r-- | src/gallium/drivers/iris/iris_context.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_state.c | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 21877173b3f..30a585f2741 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -713,6 +713,7 @@ struct iris_context { struct pipe_resource *blend; struct pipe_resource *index_buffer; struct pipe_resource *cs_thread_ids; + struct pipe_resource *cs_desc; } last_res; /** Records the size of variable-length state for INTEL_DEBUG=bat */ diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 5de994893e0..c65421ed132 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -4362,6 +4362,13 @@ iris_restore_compute_saved_bos(struct iris_context *ice, if (sampler_res) iris_use_pinned_bo(batch, iris_resource_bo(sampler_res), false); + if ((clean & IRIS_DIRTY_SAMPLER_STATES_CS) && + (clean & IRIS_DIRTY_BINDINGS_CS) && + (clean & IRIS_DIRTY_CONSTANTS_CS) && + (clean & IRIS_DIRTY_CS)) { + iris_use_optional_res(batch, ice->state.last_res.cs_desc, false); + } + if (clean & IRIS_DIRTY_CS) { struct iris_compiled_shader *shader = ice->shaders.prog[stage]; @@ -5531,7 +5538,6 @@ iris_upload_compute_state(struct iris_context *ice, IRIS_DIRTY_BINDINGS_CS | IRIS_DIRTY_CONSTANTS_CS | IRIS_DIRTY_CS)) { - struct pipe_resource *desc_res = NULL; uint32_t desc[GENX(INTERFACE_DESCRIPTOR_DATA_length)]; iris_pack_state(GENX(INTERFACE_DESCRIPTOR_DATA), desc, idd) { @@ -5547,10 +5553,8 @@ iris_upload_compute_state(struct iris_context *ice, GENX(INTERFACE_DESCRIPTOR_DATA_length) * sizeof(uint32_t); load.InterfaceDescriptorDataStartAddress = emit_state(batch, ice->state.dynamic_uploader, - &desc_res, desc, sizeof(desc), 64); + &ice->state.last_res.cs_desc, desc, sizeof(desc), 64); } - - pipe_resource_reference(&desc_res, NULL); } uint32_t group_size = grid->block[0] * grid->block[1] * grid->block[2]; @@ -5658,6 +5662,7 @@ iris_destroy_state(struct iris_context *ice) pipe_resource_reference(&ice->state.last_res.blend, NULL); pipe_resource_reference(&ice->state.last_res.index_buffer, NULL); pipe_resource_reference(&ice->state.last_res.cs_thread_ids, NULL); + pipe_resource_reference(&ice->state.last_res.cs_desc, NULL); } /* ------------------------------------------------------------------- */ |