AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: drop TCS key

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28483>
This commit is contained in:
Alyssa Rosenzweig
2024-02-26 17:54:16 -04:00
committed by Marge Bot
parent 72ef80dfc8
commit 6c497d41c7
3 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/asahi/agx_disk_cache.c
+2 -3
View File
@@ -39,11 +39,10 @@ agx_disk_cache_compute_key(struct disk_cache *cache,
key_size = sizeof(shader_key->vs);
else if (uncompiled->type == PIPE_SHADER_GEOMETRY)
key_size = sizeof(shader_key->gs);
else if (uncompiled->type == PIPE_SHADER_TESS_CTRL)
key_size = sizeof(shader_key->tcs);
else if (uncompiled->type == PIPE_SHADER_FRAGMENT)
key_size = sizeof(shader_key->fs);
else if (uncompiled->type == PIPE_SHADER_COMPUTE)
else if (uncompiled->type == PIPE_SHADER_COMPUTE ||
uncompiled->type == PIPE_SHADER_TESS_CTRL)
key_size = 0;
else
unreachable("Unsupported shader stage");
src/gallium/drivers/asahi/agx_state.c
+17 -39
View File
@@ -1508,18 +1508,6 @@ asahi_fs_shader_key_equal(const void *a, const void *b)
return memcmp(a, b, sizeof(struct asahi_fs_shader_key)) == 0;
}
static uint32_t
asahi_tcs_shader_key_hash(const void *key)
{
return _mesa_hash_data(key, sizeof(struct asahi_tcs_shader_key));
}
static bool
asahi_tcs_shader_key_equal(const void *a, const void *b)
{
return memcmp(a, b, sizeof(struct asahi_tcs_shader_key)) == 0;
}
/* No compute variants */
static uint32_t
asahi_cs_shader_key_hash(const void *key)
@@ -2109,10 +2097,9 @@ agx_get_shader_variant(struct agx_screen *screen, struct pipe_context *pctx,
memcpy(cloned_key, key, sizeof(struct asahi_vs_shader_key));
} else if (so->type == PIPE_SHADER_GEOMETRY) {
memcpy(cloned_key, key, sizeof(struct asahi_gs_shader_key));
} else if (so->type == PIPE_SHADER_TESS_CTRL) {
memcpy(cloned_key, key, sizeof(struct asahi_tcs_shader_key));
} else {
assert(gl_shader_stage_is_compute(so->type));
assert(gl_shader_stage_is_compute(so->type) ||
so->type == PIPE_SHADER_TESS_CTRL);
/* No key */
}
@@ -2267,13 +2254,11 @@ agx_create_shader_state(struct pipe_context *pctx,
so->variants = _mesa_hash_table_create(NULL, asahi_gs_shader_key_hash,
asahi_gs_shader_key_equal);
} else if (nir->info.stage == MESA_SHADER_TESS_EVAL) {
} else if (nir->info.stage == MESA_SHADER_TESS_EVAL ||
nir->info.stage == MESA_SHADER_TESS_CTRL) {
/* No variants */
so->variants = _mesa_hash_table_create(NULL, asahi_cs_shader_key_hash,
asahi_cs_shader_key_equal);
} else if (nir->info.stage == MESA_SHADER_TESS_CTRL) {
so->variants = _mesa_hash_table_create(NULL, asahi_tcs_shader_key_hash,
asahi_tcs_shader_key_equal);
} else {
so->variants = _mesa_hash_table_create(so, asahi_fs_shader_key_hash,
asahi_fs_shader_key_equal);
@@ -2302,10 +2287,16 @@ agx_create_shader_state(struct pipe_context *pctx,
ralloc_free(nir);
nir = NULL;
/* For shader-db, precompile a shader with a default key. This could be
* improved but hopefully this is acceptable for now.
/* Precompile shaders that have no key. For shader-db, precompile a shader
* with a default key. This could be improved but hopefully this is
* acceptable for now.
*/
if (dev->debug & AGX_DBG_PRECOMPILE) {
if (so->type == PIPE_SHADER_TESS_CTRL) {
union asahi_shader_key key = {0};
agx_get_shader_variant(agx_screen(pctx->screen), pctx, so, &pctx->debug,
&key, NULL);
} else if (dev->debug & AGX_DBG_PRECOMPILE) {
union asahi_shader_key key = {0};
switch (so->type) {
@@ -2323,7 +2314,6 @@ agx_create_shader_state(struct pipe_context *pctx,
case PIPE_SHADER_GEOMETRY:
break;
case PIPE_SHADER_TESS_CTRL:
case PIPE_SHADER_TESS_EVAL:
/* TODO: Tessellation shaders with shader-db */
return so;
@@ -2494,22 +2484,10 @@ agx_update_tcs(struct agx_context *ctx, const struct pipe_draw_info *info)
{
assert(info->mode == MESA_PRIM_PATCHES);
/* We don't bother to dirty track yet, update! */
struct asahi_tcs_shader_key key = {
.index_size_B = info->index_size,
};
memcpy(key.attribs, &ctx->attributes->key, sizeof(key.attribs));
static_assert(sizeof(key.input_nir_sha1) ==
sizeof(ctx->stage[PIPE_SHADER_VERTEX].shader->nir_sha1),
"common size for shader sha-1");
memcpy(key.input_nir_sha1, ctx->stage[PIPE_SHADER_VERTEX].shader->nir_sha1,
sizeof(key.input_nir_sha1));
return agx_update_shader(ctx, &ctx->tcs, PIPE_SHADER_TESS_CTRL,
(union asahi_shader_key *)&key);
ctx->tcs = _mesa_hash_table_next_entry(
ctx->stage[PIPE_SHADER_TESS_CTRL].shader->variants, NULL)
->data;
return true;
}
static bool
src/gallium/drivers/asahi/agx_state.h
-13
View File
@@ -512,18 +512,6 @@ struct asahi_fs_shader_key {
enum pipe_format rt_formats[PIPE_MAX_COLOR_BUFS];
};
struct asahi_tcs_shader_key {
/* Input assembly key. Simplified because we know we're operating on patches.
*/
uint8_t index_size_B;
/* Vertex shader key */
struct agx_velem_key attribs[AGX_MAX_VBUFS];
/* Tessellation control shaders must be linked with a vertex shader. */
uint8_t input_nir_sha1[20];
};
struct asahi_gs_shader_key {
/* Rasterizer shader key */
uint64_t outputs_flat_shaded;
@@ -538,7 +526,6 @@ static_assert(sizeof(struct asahi_gs_shader_key) == 24, "no holes");
union asahi_shader_key {
struct asahi_vs_shader_key vs;
struct asahi_tcs_shader_key tcs;
struct asahi_gs_shader_key gs;
struct asahi_fs_shader_key fs;
};