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

zink: remove tcs shader keys

Browse Source 
these never did anything and need a rework to become useful, assuming
I even find a case where such a thing would be needed

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12660>
This commit is contained in:
Mike Blumenkrantz
2021-06-24 10:27:05 -04:00
committed by Marge Bot
parent 75ed571921
commit 43cfd97ade
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_program.c
+2 -6
View File
@@ -158,11 +158,7 @@ static void
shader_key_tcs_gen(struct zink_context *ctx, struct zink_shader *zs,
struct zink_shader *shaders[ZINK_SHADER_COUNT], struct zink_shader_key *key)
{
struct zink_tcs_key *tcs_key = &key->key.tcs;
key->size = sizeof(struct zink_tcs_key);
tcs_key->vertices_per_patch = ctx->gfx_pipeline_state.vertices_per_patch + 1;
tcs_key->vs_outputs_written = shaders[PIPE_SHADER_VERTEX]->nir->info.outputs_written;
key->size = 0;
}
typedef void (*zink_shader_key_gen)(struct zink_context *ctx, struct zink_shader *zs,
@@ -206,7 +202,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_shader *zs, st
shader_key_vtbl[stage](ctx, zs, prog->shaders, &key);
/* this is default variant if there is no default or it matches the default */
if (prog->default_variant_key[pstage]) {
if (pstage != PIPE_SHADER_TESS_CTRL && prog->default_variant_key[pstage]) {
const struct keybox *tmp = prog->default_variant_key[pstage];
/* if comparing against the existing default, use the base variant key size since
* we're only checking the stage-specific data
src/gallium/drivers/zink/zink_shader_keys.h
-6
View File
@@ -39,11 +39,6 @@ struct zink_fs_key {
bool force_dual_color_blend;
};
struct zink_tcs_key {
unsigned vertices_per_patch;
uint64_t vs_outputs_written;
};
struct zink_shader_key_base {
uint32_t inlined_uniform_values[MAX_INLINABLE_UNIFORMS];
};
@@ -58,7 +53,6 @@ struct zink_shader_key {
/* reuse vs key for now with tes/gs since we only use clip_halfz */
struct zink_vs_key vs;
struct zink_fs_key fs;
struct zink_tcs_key tcs;
} key;
struct zink_shader_key_base base;
unsigned inline_uniforms:1;