From 1b5873b73cdfe288a9defdcc1455c2809f3437fc Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Sun, 1 Sep 2019 10:24:30 +0200 Subject: [PATCH] panfrost: Use a pipe_framebuffer_state as the batch key This way we have all the fb_state information directly attached to a batch and can pass only the batch to functions emitting CMDs, which is needed if we want to be able to queue CMDs to a batch that's not currently bound to the context. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/pan_job.c | 40 +++++++++++----------------------- src/gallium/drivers/panfrost/pan_job.h | 15 ++++--------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index 58b4941..4d30c2a 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -32,7 +32,8 @@ #include "util/u_pack_color.h" struct panfrost_batch * -panfrost_create_batch(struct panfrost_context *ctx) +panfrost_create_batch(struct panfrost_context *ctx, + const struct pipe_framebuffer_state *key) { struct panfrost_batch *batch = rzalloc(ctx, struct panfrost_batch); @@ -48,6 +49,7 @@ panfrost_create_batch(struct panfrost_context *ctx) util_dynarray_init(&batch->headers, batch); util_dynarray_init(&batch->gpu_headers, batch); + util_copy_framebuffer_state(&batch->key, key); return batch; } @@ -73,37 +75,25 @@ panfrost_free_batch(struct panfrost_batch *batch) if (ctx->batch == batch) ctx->batch = NULL; + util_unreference_framebuffer_state(&batch->key); ralloc_free(batch); } struct panfrost_batch * panfrost_get_batch(struct panfrost_context *ctx, - struct pipe_surface **cbufs, struct pipe_surface *zsbuf) + const struct pipe_framebuffer_state *key) { /* Lookup the job first */ - - struct panfrost_batch_key key = { - .cbufs = { - cbufs[0], - cbufs[1], - cbufs[2], - cbufs[3], - }, - .zsbuf = zsbuf - }; - - struct hash_entry *entry = _mesa_hash_table_search(ctx->batches, &key); + struct hash_entry *entry = _mesa_hash_table_search(ctx->batches, key); if (entry) return entry->data; /* Otherwise, let's create a job */ - struct panfrost_batch *batch = panfrost_create_batch(ctx); + struct panfrost_batch *batch = panfrost_create_batch(ctx, key); /* Save the created job */ - - memcpy(&batch->key, &key, sizeof(key)); _mesa_hash_table_insert(ctx->batches, &batch->key, batch); return batch; @@ -123,18 +113,14 @@ panfrost_get_batch_for_fbo(struct panfrost_context *ctx) /* If we already began rendering, use that */ if (ctx->batch) { - assert(ctx->batch->key.zsbuf == ctx->pipe_framebuffer.zsbuf && - !memcmp(ctx->batch->key.cbufs, - ctx->pipe_framebuffer.cbufs, - sizeof(ctx->batch->key.cbufs))); + assert(util_framebuffer_state_equal(&ctx->batch->key, + &ctx->pipe_framebuffer)); return ctx->batch; } /* If not, look up the job */ - - struct pipe_surface **cbufs = ctx->pipe_framebuffer.cbufs; - struct pipe_surface *zsbuf = ctx->pipe_framebuffer.zsbuf; - struct panfrost_batch *batch = panfrost_get_batch(ctx, cbufs, zsbuf); + struct panfrost_batch *batch = panfrost_get_batch(ctx, + &ctx->pipe_framebuffer); /* Set this job as the current FBO job. Will be reset when updating the * FB state and when submitting or releasing a job. @@ -389,13 +375,13 @@ panfrost_flush_jobs_reading_resource(struct panfrost_context *panfrost, static bool panfrost_batch_compare(const void *a, const void *b) { - return memcmp(a, b, sizeof(struct panfrost_batch_key)) == 0; + return util_framebuffer_state_equal(a, b); } static uint32_t panfrost_batch_hash(const void *key) { - return _mesa_hash_data(key, sizeof(struct panfrost_batch_key)); + return _mesa_hash_data(key, sizeof(struct pipe_framebuffer_state)); } /* Given a new bounding rectangle (scissor), let the job cover the union of the diff --git a/src/gallium/drivers/panfrost/pan_job.h b/src/gallium/drivers/panfrost/pan_job.h index c9f4878..7854e0a 100644 --- a/src/gallium/drivers/panfrost/pan_job.h +++ b/src/gallium/drivers/panfrost/pan_job.h @@ -31,13 +31,6 @@ #include "pan_allocate.h" #include "pan_resource.h" -/* Used as a hash table key */ - -struct panfrost_batch_key { - struct pipe_surface *cbufs[4]; - struct pipe_surface *zsbuf; -}; - #define PAN_REQ_MSAA (1 << 0) #define PAN_REQ_DEPTH_WRITE (1 << 1) @@ -46,7 +39,7 @@ struct panfrost_batch_key { struct panfrost_batch { struct panfrost_context *ctx; - struct panfrost_batch_key key; + struct pipe_framebuffer_state key; /* Buffers cleared (PIPE_CLEAR_* bitmask) */ unsigned clear; @@ -120,15 +113,15 @@ struct panfrost_batch { /* Functions for managing the above */ struct panfrost_batch * -panfrost_create_batch(struct panfrost_context *ctx); +panfrost_create_batch(struct panfrost_context *ctx, + const struct pipe_framebuffer_state *key); void panfrost_free_batch(struct panfrost_batch *batch); struct panfrost_batch * panfrost_get_batch(struct panfrost_context *ctx, - struct pipe_surface **cbufs, - struct pipe_surface *zsbuf); + const struct pipe_framebuffer_state *key); struct panfrost_batch * panfrost_get_batch_for_fbo(struct panfrost_context *ctx); -- 2.7.4