Mesa (master): etnaviv: fix compile warnings

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f834656a41698d3a72be7be67ea2f998dd12f75f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f834656a41698d3a72be7be67ea2f998dd12f75f

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Sun Oct 20 07:38:03 2019 +0200

etnaviv: fix compile warnings

Fixes: e5cc66dfad0 ("etnaviv: Rework locking")
Fixes: 1456aa61cc5 ("etnaviv: Rework resource status tracking")
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Jonathan Marek <jonathan at marek.ca>

---

 src/gallium/drivers/etnaviv/etnaviv_context.c  | 2 --
 src/gallium/drivers/etnaviv/etnaviv_resource.c | 4 ----
 src/gallium/drivers/etnaviv/etnaviv_transfer.c | 1 -
 3 files changed, 7 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c
index 367f31f2e9b..5fdc77699ee 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_context.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_context.c
@@ -61,7 +61,6 @@ static void
 etna_context_destroy(struct pipe_context *pctx)
 {
    struct etna_context *ctx = etna_context(pctx);
-   struct etna_screen *screen = ctx->screen;
 
    mtx_lock(&ctx->lock);
    if (ctx->used_resources_read) {
@@ -434,7 +433,6 @@ etna_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
            enum pipe_flush_flags flags)
 {
    struct etna_context *ctx = etna_context(pctx);
-   struct etna_screen *screen = ctx->screen;
    int out_fence_fd = -1;
 
    mtx_lock(&ctx->lock);
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 5d72e83da73..f1e314cb06f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -612,7 +612,6 @@ etna_resource_get_status(struct etna_context *ctx, struct etna_resource *rsc)
 
    set_foreach(rsc->pending_ctx, entry) {
       struct etna_context *extctx = (struct etna_context *)entry->key;
-      struct pipe_context *pctx = &extctx->base;
 
       set_foreach(extctx->used_resources_read, entry2) {
          struct etna_resource *rsc2 = (struct etna_resource *)entry2->key;
@@ -638,7 +637,6 @@ void
 etna_resource_used(struct etna_context *ctx, struct pipe_resource *prsc,
                    enum etna_resource_status status)
 {
-   struct etna_screen *screen = ctx->screen;
    struct pipe_resource *referenced = NULL;
    struct etna_resource *rsc;
 
@@ -649,8 +647,6 @@ etna_resource_used(struct etna_context *ctx, struct pipe_resource *prsc,
 
    rsc = etna_resource(prsc);
 
-   enum etna_resource_status newstatus = 0;
-
    set_foreach(rsc->pending_ctx, entry) {
       struct etna_context *extctx = (struct etna_context *)entry->key;
       struct pipe_context *pctx = &extctx->base;
diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
index 8b6466d5269..ade4e877bf1 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
@@ -346,7 +346,6 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
     * transfers without a temporary resource.
     */
    if (trans->rsc || !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
-      struct etna_screen *screen = ctx->screen;
       uint32_t prep_flags = 0;
 
       /*