fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 06:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: Drop 'old_address' parameter from iris_rebind_buffer

Browse source 
We can just compare the VERTEX_BUFFER_STATE address field to the
current BO's address.  When calling rebind, we've already updated
the resource to the new buffer, but the state will have the old
address.
This commit is contained in:
Kenneth Graunke 2019-10-31 09:41:49 -07:00
parent 518be59c1a
commit 4c1f81ad62
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/iris/iris_context.h
View file

@ -432,8 +432,7 @@ struct iris_vtable {
struct iris_batch *batch,
const struct pipe_grid_info *grid);
void (*rebind_buffer)(struct iris_context *ice,
struct iris_resource *res,
uint64_t old_address);
struct iris_resource *res);
void (*resolve_conditional_render)(struct iris_context *ice);
void (*load_register_reg32)(struct iris_batch *batch, uint32_t dst,
uint32_t src);

2
src/gallium/drivers/iris/iris_resource.c
View file

@ -1265,7 +1265,7 @@ iris_invalidate_resource(struct pipe_context *ctx,
/* Rebind the buffer, replacing any state referring to the old BO's
* address, and marking state dirty so it's reemitted.
*/
ice->vtbl.rebind_buffer(ice, res, old_bo->gtt_offset);
ice->vtbl.rebind_buffer(ice, res);
util_range_set_empty(&res->valid_buffer_range);

8
src/gallium/drivers/iris/iris_state.c
View file

@ -6368,8 +6368,7 @@ iris_destroy_state(struct iris_context *ice)
static void
iris_rebind_buffer(struct iris_context *ice,
struct iris_resource *res,
uint64_t old_address)
struct iris_resource *res)
{
struct pipe_context *ctx = &ice->ctx;
struct iris_screen *screen = (void *) ctx->screen;
@ -6398,9 +6397,10 @@ iris_rebind_buffer(struct iris_context *ice,
STATIC_ASSERT(GENX(VERTEX_BUFFER_STATE_BufferStartingAddress_start) == 32);
STATIC_ASSERT(GENX(VERTEX_BUFFER_STATE_BufferStartingAddress_bits) == 64);
uint64_t *addr = (uint64_t *) &state->state[1];
struct iris_bo *bo = iris_resource_bo(state->resource);
if (*addr == old_address + state->offset) {
*addr = res->bo->gtt_offset + state->offset;
if (*addr != bo->gtt_offset + state->offset) {
*addr = bo->gtt_offset + state->offset;
ice->state.dirty |= IRIS_DIRTY_VERTEX_BUFFERS;
}
}