diff --git a/.pick_status.json b/.pick_status.json index 3116adc9d5b..fc2c9c7e58d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -787,7 +787,7 @@ "description": "etnaviv: Remove etna_resource_get_status()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c index 4a992b5f668..1f763c2b683 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_resource.c +++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c @@ -603,34 +603,6 @@ etna_resource_get_handle(struct pipe_screen *pscreen, } } -enum etna_resource_status -etna_resource_get_status(struct etna_context *ctx, struct etna_resource *rsc) -{ - enum etna_resource_status newstatus = 0; - - set_foreach(rsc->pending_ctx, entry) { - struct etna_context *extctx = (struct etna_context *)entry->key; - - set_foreach(extctx->used_resources_read, entry2) { - struct etna_resource *rsc2 = (struct etna_resource *)entry2->key; - if (ctx == extctx || rsc2 != rsc) - continue; - - newstatus |= ETNA_PENDING_READ; - } - - set_foreach(extctx->used_resources_write, entry2) { - struct etna_resource *rsc2 = (struct etna_resource *)entry2->key; - if (ctx == extctx || rsc2 != rsc) - continue; - - newstatus |= ETNA_PENDING_WRITE; - } - } - - return newstatus; -} - void etna_resource_used(struct etna_context *ctx, struct pipe_resource *prsc, enum etna_resource_status status) diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.h b/src/gallium/drivers/etnaviv/etnaviv_resource.h index 1da0315ab9e..25d263db1ec 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_resource.h +++ b/src/gallium/drivers/etnaviv/etnaviv_resource.h @@ -150,9 +150,6 @@ etna_resource(struct pipe_resource *p) return (struct etna_resource *)p; } -enum etna_resource_status -etna_resource_get_status(struct etna_context *ctx, struct etna_resource *rsc); - void etna_resource_used(struct etna_context *ctx, struct pipe_resource *prsc, enum etna_resource_status status);