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

nir/lower_clip: set clip_distance_array_size outside of create_clipdist_vars

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32363>
This commit is contained in:
Marek Olšák
2024-11-26 10:52:07 -05:00
committed by Marge Bot
parent b4ef50bca8
commit 3b8e4a71fe
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_clip.c
+13 -7
View File
@@ -74,9 +74,6 @@ create_clipdist_vars(nir_shader *shader, nir_variable **io_vars,
unsigned ucp_enables, bool output,
bool use_clipdist_array)
{
shader->info.clip_distance_array_size = util_last_bit(ucp_enables);
if (shader->info.io_lowered)
return;
if (use_clipdist_array) {
io_vars[0] =
create_clipdist_var(shader, output,
@@ -396,13 +393,19 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars,
if (!find_clipvertex_and_position_outputs(shader, &clipvertex, &position))
return false;
/* insert CLIPDIST outputs */
create_clipdist_vars(shader, out, ucp_enables, true, use_clipdist_array);
shader->info.clip_distance_array_size = util_last_bit(ucp_enables);
if (!use_vars || shader->info.io_lowered) {
/* If the driver has lowered IO instead of st/mesa, the driver expects
* that variables are present even with lowered IO, so create them.
*/
if (!shader->info.io_lowered)
create_clipdist_vars(shader, out, ucp_enables, true, use_clipdist_array);
lower_clip_vertex_intrin(&b, out, ucp_enables, use_clipdist_array,
clipplane_state_tokens);
} else {
create_clipdist_vars(shader, out, ucp_enables, true, use_clipdist_array);
lower_clip_vertex_var(&b, position, clipvertex, out, ucp_enables,
use_clipdist_array, clipplane_state_tokens);
}
@@ -464,9 +467,11 @@ nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables,
if (!find_clipvertex_and_position_outputs(shader, &clipvertex, &position))
return false;
shader->info.clip_distance_array_size = util_last_bit(ucp_enables);
/* insert CLIPDIST outputs */
create_clipdist_vars(shader, out, ucp_enables, true,
use_clipdist_array);
if (!shader->info.io_lowered)
create_clipdist_vars(shader, out, ucp_enables, true, use_clipdist_array);
b = nir_builder_create(impl);
@@ -555,6 +560,7 @@ nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables,
/* this is probably broken until https://gitlab.freedesktop.org/mesa/mesa/-/issues/10826 is fixed */
assert(!shader->info.io_lowered);
shader->info.clip_distance_array_size = util_last_bit(ucp_enables);
/* No hard reason to require use_clipdist_arr to work with
* frag-shader-based gl_ClipDistance, except that the only user that does