Mesa (master): Revert "zink: update shader modules in gfx program when flagged dirty"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 24 21:57:39 UTC 2020
Module: Mesa
Branch: master
Commit: 469c59f8eade8fa72dfe0260abaccced69d2aa8d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=469c59f8eade8fa72dfe0260abaccced69d2aa8d
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Tue Nov 24 16:31:49 2020 +0100
Revert "zink: update shader modules in gfx program when flagged dirty"
This reverts commit e96afeeb7bb2306aa0fba76e27163d4c7a86860b.
Fixes: e96afeeb7bb ("zink: update shader modules in gfx program when flagged dirty")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7754>
---
src/gallium/drivers/zink/zink_draw.c | 4 +---
src/gallium/drivers/zink/zink_program.c | 13 ++++---------
src/gallium/drivers/zink/zink_program.h | 4 ----
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index f359098cb24..ede1f9b6265 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -164,9 +164,7 @@ get_gfx_program(struct zink_context *ctx)
if (ctx->dirty_shader_stages) {
struct hash_entry *entry = _mesa_hash_table_search(ctx->program_cache,
ctx->gfx_stages);
- if (entry)
- zink_update_gfx_program(ctx, entry->data);
- else {
+ if (!entry) {
struct zink_gfx_program *prog;
prog = zink_create_gfx_program(ctx, ctx->gfx_stages);
entry = _mesa_hash_table_insert(ctx->program_cache, prog->shaders, prog);
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index a4f1c3ac4d9..ebe0c1ab7ad 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -287,7 +287,7 @@ zink_shader_cache_reference(struct zink_screen *screen,
}
static void
-update_shader_modules(struct zink_context *ctx, struct zink_shader *stages[ZINK_SHADER_COUNT], struct zink_gfx_program *prog, bool update)
+update_shader_modules(struct zink_context *ctx, struct zink_shader *stages[ZINK_SHADER_COUNT], struct zink_gfx_program *prog)
{
struct zink_shader *dirty[ZINK_SHADER_COUNT] = {NULL};
@@ -307,7 +307,7 @@ update_shader_modules(struct zink_context *ctx, struct zink_shader *stages[ZINK_
dirty[i]->has_geometry_shader = dirty[MESA_SHADER_GEOMETRY] || stages[PIPE_SHADER_GEOMETRY];
zm = get_shader_module_for_stage(ctx, dirty[i], prog);
zink_shader_module_reference(zink_screen(ctx->base.screen), &prog->modules[type], zm);
- } else if (stages[type] && !update) /* reuse existing shader module */
+ } else if (stages[type]) /* reuse existing shader module */
zink_shader_module_reference(zink_screen(ctx->base.screen), &prog->modules[type], ctx->curr_program->modules[type]);
prog->shaders[type] = stages[type];
}
@@ -330,6 +330,7 @@ static void
init_slot_map(struct zink_context *ctx, struct zink_gfx_program *prog)
{
unsigned existing_shaders = 0;
+
/* if there's a case where we'll be reusing any shaders, we need to reuse the slot map too */
if (ctx->curr_program) {
for (int i = 0; i < ZINK_SHADER_COUNT; ++i) {
@@ -356,12 +357,6 @@ init_slot_map(struct zink_context *ctx, struct zink_gfx_program *prog)
}
}
-void
-zink_update_gfx_program(struct zink_context *ctx, struct zink_gfx_program *prog)
-{
- update_shader_modules(ctx, ctx->gfx_stages, prog, true);
-}
-
struct zink_gfx_program *
zink_create_gfx_program(struct zink_context *ctx,
struct zink_shader *stages[ZINK_SHADER_COUNT])
@@ -375,7 +370,7 @@ zink_create_gfx_program(struct zink_context *ctx,
init_slot_map(ctx, prog);
- update_shader_modules(ctx, stages, prog, false);
+ update_shader_modules(ctx, stages, prog);
for (int i = 0; i < ARRAY_SIZE(prog->pipelines); ++i) {
prog->pipelines[i] = _mesa_hash_table_create(NULL,
diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index bab2a2419c2..760144787ef 100644
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -70,10 +70,6 @@ struct zink_gfx_program {
struct set *render_passes;
};
-
-void
-zink_update_gfx_program(struct zink_context *ctx, struct zink_gfx_program *prog);
-
struct zink_gfx_program *
zink_create_gfx_program(struct zink_context *ctx,
struct zink_shader *stages[ZINK_SHADER_COUNT]);
More information about the mesa-commit
mailing list