fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 08:30:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

d3d12: Update nir varying bitmasks when linking stages

Browse source 
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14881>
This commit is contained in:
Jesse Natalie 2022-02-04 08:22:08 -08:00 • committed by Marge Bot
parent 27deedc104
commit 3feae7ec5d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1092,6 +1092,7 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
/* Add the needed in and outputs, and re-sort */
if (prev) {
uint64_t mask = key.required_varying_inputs.mask & ~new_nir_variant->info.inputs_read;
new_nir_variant->info.inputs_read |= mask;
while (mask) {
int slot = u_bit_scan64(&mask);
create_varyings_from_info(new_nir_variant, &key.required_varying_inputs, slot, nir_var_shader_in, false);
@ -1099,6 +1100,7 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
if (sel->stage == PIPE_SHADER_TESS_EVAL) {
uint32_t patch_mask = (uint32_t)key.ds.required_patch_inputs.mask & ~new_nir_variant->info.patch_inputs_read;
new_nir_variant->info.patch_inputs_read |= patch_mask;
while (patch_mask) {
int slot = u_bit_scan(&patch_mask);
create_varyings_from_info(new_nir_variant, &key.ds.required_patch_inputs, slot, nir_var_shader_in, true);
@ -1111,6 +1113,7 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
if (next) {
uint64_t mask = key.required_varying_outputs.mask & ~new_nir_variant->info.outputs_written;
new_nir_variant->info.outputs_written |= mask;
while (mask) {
int slot = u_bit_scan64(&mask);
create_varyings_from_info(new_nir_variant, &key.required_varying_outputs, slot, nir_var_shader_out, false);
@ -1118,6 +1121,7 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
if (sel->stage == PIPE_SHADER_TESS_CTRL) {
uint32_t patch_mask = (uint32_t)key.hs.required_patch_outputs.mask & ~new_nir_variant->info.patch_outputs_written;
new_nir_variant->info.patch_outputs_written |= patch_mask;
while (patch_mask) {
int slot = u_bit_scan(&patch_mask);
create_varyings_from_info(new_nir_variant, &key.ds.required_patch_inputs, slot, nir_var_shader_out, true);