Mesa (staging/20.1): etnaviv: Remove etna_resource_get_status()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Aug 27 22:05:36 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: 8b81cffb5b3b3a6156db6863de77b35b3a5e1eed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b81cffb5b3b3a6156db6863de77b35b3a5e1eed
Author: Marek Vasut <marex at denx.de>
Date: Tue Jul 21 16:21:34 2020 +0200
etnaviv: Remove etna_resource_get_status()
This function is not used, remove it.
Signed-off-by: Marek Vasut <marex at denx.de>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6454>
(cherry picked from commit da660c90bf94527c3d54a9a59e7f7df935480479)
---
.pick_status.json | 2 +-
src/gallium/drivers/etnaviv/etnaviv_resource.c | 28 --------------------------
src/gallium/drivers/etnaviv/etnaviv_resource.h | 3 ---
3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index fc6086d3add..fac75b2098e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -346,7 +346,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);
More information about the mesa-commit
mailing list