Module: Mesa Branch: 17.3 Commit: 9710fbbcdfbc0d99424a333d692cae14a88a7863 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9710fbbcdfbc0d99424a333d692cae14a88a7863
Author: Timothy Arceri <tarc...@itsqueeze.com> Date: Tue Oct 31 14:19:18 2017 +1100 radeonsi: fix culldist_writemask in nir path The shared si_create_shader_selector() code already offsets the mask. Fixes the following piglit tests: arb_cull_distance/clip-cull-3.shader_test arb_cull_distance/clip-cull-4.shader_test Fixes: 29d7bdd179bb (radeonsi: scan NIR shaders to obtain required info) Reviewed-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit e80bbd6f52341cbf9363f3c0c8b7ad3be851b1e6) --- src/gallium/drivers/radeonsi/si_shader_nir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index e186661caf..7a88227381 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -302,8 +302,7 @@ void si_nir_scan_shader(const struct nir_shader *nir, info->num_written_clipdistance = nir->info.clip_distance_array_size; info->num_written_culldistance = nir->info.cull_distance_array_size; info->clipdist_writemask = u_bit_consecutive(0, info->num_written_clipdistance); - info->culldist_writemask = u_bit_consecutive(info->num_written_clipdistance, - info->num_written_culldistance); + info->culldist_writemask = u_bit_consecutive(0, info->num_written_culldistance); if (info->processor == PIPE_SHADER_FRAGMENT) info->uses_kill = nir->info.fs.uses_discard; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit