OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Drop panfrost_invalidate_frame

Browse Source 
Only used to initialize active_queries once at context initialization,
then unneeded.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6327>
This commit is contained in:
Alyssa Rosenzweig
2020-08-14 18:22:36 -04:00
committed by Marge Bot
parent 1362371a96
commit 4b21c8b15f
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/panfrost/pan_context.c
View File

@@ -144,16 +144,6 @@ panfrost_clear(
panfrost_batch_clear(batch, buffers, color, depth, stencil); panfrost_batch_clear(batch, buffers, color, depth, stencil);
} }
/* Reset per-frame context, called on context initialisation as well as after
* flushing a frame */
void
panfrost_invalidate_frame(struct panfrost_context *ctx)
{
/* TODO: When does this need to be handled? */
ctx->active_queries = true;
}
bool bool
panfrost_writes_point_size(struct panfrost_context *ctx) panfrost_writes_point_size(struct panfrost_context *ctx)
{ {
@@ -1041,7 +1031,6 @@ panfrost_set_framebuffer_state(struct pipe_context *pctx,
util_copy_framebuffer_state(&ctx->pipe_framebuffer, fb); util_copy_framebuffer_state(&ctx->pipe_framebuffer, fb);
ctx->batch = NULL; ctx->batch = NULL;
panfrost_invalidate_frame(ctx);
/* We may need to generate a new variant if the fragment shader is /* We may need to generate a new variant if the fragment shader is
* keyed to the framebuffer format (due to EXT_framebuffer_fetch) */ * keyed to the framebuffer format (due to EXT_framebuffer_fetch) */
@@ -1491,7 +1480,6 @@ panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags)
/* Prepare for render! */ /* Prepare for render! */
panfrost_batch_init(ctx); panfrost_batch_init(ctx);
panfrost_invalidate_frame(ctx);
if (!(dev->quirks & IS_BIFROST)) { if (!(dev->quirks & IS_BIFROST)) {
for (unsigned c = 0; c < PIPE_MAX_COLOR_BUFS; ++c) for (unsigned c = 0; c < PIPE_MAX_COLOR_BUFS; ++c)
@@ -1500,6 +1488,7 @@ panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags)
/* By default mask everything on */ /* By default mask everything on */
ctx->sample_mask = ~0; ctx->sample_mask = ~0;
ctx->active_queries = true;
return gallium; return gallium;
} }

3
src/gallium/drivers/panfrost/pan_context.h
View File

@@ -303,9 +303,6 @@ panfrost_get_shader_state(struct panfrost_context *ctx,
struct pipe_context * struct pipe_context *
panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags); panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags);
void
panfrost_invalidate_frame(struct panfrost_context *ctx);
bool bool
panfrost_writes_point_size(struct panfrost_context *ctx); panfrost_writes_point_size(struct panfrost_context *ctx);

13
src/gallium/drivers/panfrost/pan_job.c
View File

@@ -121,23 +121,16 @@ panfrost_freeze_batch(struct panfrost_batch *batch)
struct hash_entry *entry; struct hash_entry *entry;
/* Remove the entry in the FBO -> batch hash table if the batch /* Remove the entry in the FBO -> batch hash table if the batch
* matches. This way, next draws/clears targeting this FBO will trigger * matches and drop the context reference. This way, next draws/clears
* the creation of a new batch. * targeting this FBO will trigger the creation of a new batch.
*/ */
entry = _mesa_hash_table_search(ctx->batches, &batch->key); entry = _mesa_hash_table_search(ctx->batches, &batch->key);
if (entry && entry->data == batch) if (entry && entry->data == batch)
_mesa_hash_table_remove(ctx->batches, entry); _mesa_hash_table_remove(ctx->batches, entry);
/* If this is the bound batch, the panfrost_context parameters are if (ctx->batch == batch)
* relevant so submitting it invalidates those parameters, but if it's
* not bound, the context parameters are for some other batch so we
* can't invalidate them.
*/
if (ctx->batch == batch) {
panfrost_invalidate_frame(ctx);
ctx->batch = NULL; ctx->batch = NULL;
} }
}
#ifdef PAN_BATCH_DEBUG #ifdef PAN_BATCH_DEBUG
static bool panfrost_batch_is_frozen(struct panfrost_batch *batch) static bool panfrost_batch_is_frozen(struct panfrost_batch *batch)