fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

d3d12: Use TES inputs rather than VS outputs for TCS variant key

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28535>
This commit is contained in:
Jesse Natalie 2024-04-01 14:27:18 -07:00 • committed by Marge Bot
parent 580f801bac
commit c8d435373e
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/d3d12/d3d12_compiler.cpp
View file

@ -562,10 +562,7 @@ fill_varyings(struct d3d12_context *ctx, const nir_shader *s,
}
const struct glsl_type *type = var->type;
if ((s->info.stage == MESA_SHADER_GEOMETRY ||
s->info.stage == MESA_SHADER_TESS_CTRL) &&
(modes & nir_var_shader_in) &&
glsl_type_is_array(type))
if (nir_is_arrayed_io(var, s->info.stage))
type = glsl_get_array_element(type);
info.slots[slot].types[var->data.location_frac] = type;
@ -729,7 +726,6 @@ validate_tess_ctrl_shader_variant(struct d3d12_selection_context *sel_ctx)
if (tcs != NULL && !tcs->is_variant)
return;
d3d12_shader_selector *vs = ctx->gfx_stages[PIPE_SHADER_VERTEX];
d3d12_shader_selector *tes = ctx->gfx_stages[PIPE_SHADER_TESS_EVAL];
struct d3d12_tcs_variant_key key = {0};
@ -737,11 +733,12 @@ validate_tess_ctrl_shader_variant(struct d3d12_selection_context *sel_ctx)
/* Fill the variant key */
if (variant_needed) {
if (vs->initial_output_vars == nullptr) {
vs->initial_output_vars = fill_varyings(sel_ctx->ctx, vs->initial, nir_var_shader_out,
vs->initial->info.outputs_written, false);
if (tes->initial_input_vars == nullptr) {
tes->initial_input_vars = fill_varyings(sel_ctx->ctx, tes->initial, nir_var_shader_in,
tes->initial->info.inputs_read & ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER),
false);
}
key.varyings = vs->initial_output_vars;
key.varyings = tes->initial_input_vars;
key.vertices_out = ctx->patch_vertices;
}
@ -1519,6 +1516,7 @@ d3d12_create_shader_impl(struct d3d12_context *ctx,
/* Keep this initial shader as the blue print for possible variants */
sel->initial = nir;
sel->initial_output_vars = nullptr;
sel->initial_input_vars = nullptr;
sel->gs_key.varyings = nullptr;
sel->tcs_key.varyings = nullptr;

1
src/gallium/drivers/d3d12/d3d12_compiler.h
View file

@ -269,6 +269,7 @@ struct d3d12_shader_selector {
enum pipe_shader_type stage;
const nir_shader *initial;
struct d3d12_varying_info *initial_output_vars;
struct d3d12_varying_info *initial_input_vars;
struct d3d12_shader *first;
struct d3d12_shader *current;