Mesa (main): lavapipe: Use shader_info::uses_sample_shading

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 33092faef1d04c10482abe15ce1e76871eca2cbf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33092faef1d04c10482abe15ce1e76871eca2cbf

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Wed Jul 20 11:44:21 2022 -0500

lavapipe: Use shader_info::uses_sample_shading

This is more accurate because it's computed directly in spirv_to_nir and
takes even unused SampleID and SamplePos builtings into account.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17669>

---

 src/gallium/frontends/lavapipe/lvp_pipeline.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index ce64a28e3a6..4e20f5180ce 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -1389,9 +1389,7 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline,
                                      pipeline->pipeline_nir[MESA_SHADER_GEOMETRY]->info.gs.output_primitive == SHADER_PRIM_LINES;
          break;
       case MESA_SHADER_FRAGMENT:
-         if (pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]->info.fs.uses_sample_qualifier ||
-             BITSET_TEST(pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]->info.system_values_read, SYSTEM_VALUE_SAMPLE_ID) ||
-             BITSET_TEST(pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]->info.system_values_read, SYSTEM_VALUE_SAMPLE_POS))
+         if (pipeline->pipeline_nir[MESA_SHADER_FRAGMENT]->info.fs.uses_sample_shading)
             pipeline->force_min_sample = true;
          break;
       default: break;