mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

nir/lower_clip: update inputs/ouputs read/written bitmask 

Set the proper bit when adding clipdist load/store.

It also sets the variable name to match with the CLIPDISTn created.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28798>
This commit is contained in:
Juan A. Suarez Romero 2024-04-17 18:09:21 +02:00 committed by Marge Bot
parent 2e79234f9d
commit 9d5af35318
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/nir/nir_lower_clip.c
View File

@ -54,7 +54,7 @@ create_clipdist_var(nir_shader *shader,
var->data.mode = nir_var_shader_in;
shader->num_inputs += MAX2(1, DIV_ROUND_UP(array_size, 4));
}
var->name = ralloc_asprintf(var, "clipdist_%d", var->data.driver_location);
var->name = ralloc_asprintf(var, "clipdist_%d", slot - VARYING_SLOT_CLIP_DIST0);
var->data.index = 0;
var->data.location = slot;
@ -265,6 +265,19 @@ get_ucp(nir_builder *b, int plane,
return nir_load_user_clip_plane(b, plane);
}
static uint64_t
update_mask(uint32_t ucp_enables)
{
uint64_t mask = 0;
if (ucp_enables & 0x0f)
mask |= VARYING_BIT_CLIP_DIST0;
if (ucp_enables & 0xf0)
mask |= VARYING_BIT_CLIP_DIST1;
return mask;
}
static void
lower_clip_outputs(nir_builder *b, nir_variable *position,
nir_variable *clipvertex, nir_variable **out,
@ -327,6 +340,7 @@ lower_clip_outputs(nir_builder *b, nir_variable *position,
if (ucp_enables & 0xf0)
store_clipdist_output(b, out[1], VARYING_SLOT_CLIP_DIST1, 0, &clipdist[4], use_clipdist_array);
}
b->shader->info.outputs_written |= update_mask(ucp_enables);
}
}
@ -475,6 +489,7 @@ lower_clip_fs(nir_function_impl *impl, unsigned ucp_enables,
if (ucp_enables & 0xf0)
load_clipdist_input(&b, in[0], 1, &clipdist[4]);
}
b.shader->info.inputs_read |= update_mask(ucp_enables);
nir_def *cond = NULL;