Mesa (main): intel/fs: Use nir_lower_single_sampled
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jul 13 21:04:29 UTC 2022
Module: Mesa
Branch: main
Commit: fd17aaf430d3b4753dbff964ea3dc5541f14db8b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd17aaf430d3b4753dbff964ea3dc5541f14db8b
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri Nov 19 13:00:09 2021 -0600
intel/fs: Use nir_lower_single_sampled
This lets us drop demote_sample_qualifiers as well as a back-end check
for key->multisample_fbo.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14020>
---
src/intel/ci/iris-kbl-fails.txt | 67 -----------------------------------------
src/intel/compiler/brw_fs.cpp | 49 ++----------------------------
src/intel/compiler/brw_nir.c | 3 ++
3 files changed, 6 insertions(+), 113 deletions(-)
diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt
index 7b83e9e70ae..60c5be5d9c1 100644
--- a/src/intel/ci/iris-kbl-fails.txt
+++ b/src/intel/ci/iris-kbl-fails.txt
@@ -97,73 +97,6 @@ spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE
spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT,Fail
spec at arb_query_buffer_object@qbo at query-GL_TIME_ELAPSED-SYNC_CPU_READ_AFTER_CACHE_TEST-GL_UNSIGNED_INT64_ARB,Fail
-spec at arb_sample_shading@samplemask 16,Fail
-spec at arb_sample_shading@samplemask 16 at 0.062500 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all,Fail
-spec at arb_sample_shading@samplemask 16 all at 0.062500 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 16 all at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2,Fail
-spec at arb_sample_shading@samplemask 2 at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 all,Fail
-spec at arb_sample_shading@samplemask 2 all at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 all at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 all at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 2 all at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4,Fail
-spec at arb_sample_shading@samplemask 4 at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 all,Fail
-spec at arb_sample_shading@samplemask 4 all at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 all at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 all at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 all at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 4 all at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6,Fail
-spec at arb_sample_shading@samplemask 6 at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all,Fail
-spec at arb_sample_shading@samplemask 6 all at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 6 all at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8,Fail
-spec at arb_sample_shading@samplemask 8 at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 at sample mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all,Fail
-spec at arb_sample_shading@samplemask 8 all at 0.125000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all at 0.250000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all at 0.500000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all at 1.000000 mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all at noms mask_in_one,Fail
-spec at arb_sample_shading@samplemask 8 all at sample mask_in_one,Fail
-
spec at arb_shader_image_load_store@early-z,Fail
spec at arb_shader_image_load_store@early-z at occlusion query test/early-z pass,Fail
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 17cd14f87de..3e6e9f3bf8a 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -1322,13 +1322,9 @@ fs_visitor::emit_sampleid_setup()
const fs_builder abld = bld.annotate("compute sample id");
fs_reg sample_id = abld.vgrf(BRW_REGISTER_TYPE_UD);
- if (!key->multisample_fbo) {
- /* As per GL_ARB_sample_shading specification:
- * "When rendering to a non-multisample buffer, or if multisample
- * rasterization is disabled, gl_SampleID will always be zero."
- */
- abld.MOV(sample_id, brw_imm_d(0));
- } else if (devinfo->ver >= 8) {
+ assert(key->multisample_fbo);
+
+ if (devinfo->ver >= 8) {
/* Sample ID comes in as 4-bit numbers in g1.0:
*
* 15:12 Slot 3 SampleID (only used in SIMD16)
@@ -7228,43 +7224,6 @@ brw_nir_move_interpolation_to_top(nir_shader *nir)
return progress;
}
-static bool
-brw_nir_demote_sample_qualifiers_instr(nir_builder *b,
- nir_instr *instr,
- UNUSED void *cb_data)
-{
- if (instr->type != nir_instr_type_intrinsic)
- return false;
-
- nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (intrin->intrinsic != nir_intrinsic_load_barycentric_sample &&
- intrin->intrinsic != nir_intrinsic_load_barycentric_at_sample)
- return false;
-
- b->cursor = nir_before_instr(instr);
- nir_ssa_def *centroid =
- nir_load_barycentric(b, nir_intrinsic_load_barycentric_centroid,
- nir_intrinsic_interp_mode(intrin));
- nir_ssa_def_rewrite_uses(&intrin->dest.ssa, centroid);
- nir_instr_remove(instr);
- return true;
-}
-
-/**
- * Demote per-sample barycentric intrinsics to centroid.
- *
- * Useful when rendering to a non-multisampled buffer.
- */
-bool
-brw_nir_demote_sample_qualifiers(nir_shader *nir)
-{
- return nir_shader_instructions_pass(nir,
- brw_nir_demote_sample_qualifiers_instr,
- nir_metadata_block_index |
- nir_metadata_dominance,
- NULL);
-}
-
static void
brw_nir_populate_wm_prog_data(const nir_shader *shader,
const struct intel_device_info *devinfo,
@@ -7399,8 +7358,6 @@ brw_compile_fs(const struct brw_compiler *compiler,
NIR_PASS_V(nir, brw_nir_lower_alpha_to_coverage);
}
- if (!key->multisample_fbo)
- NIR_PASS_V(nir, brw_nir_demote_sample_qualifiers);
NIR_PASS_V(nir, brw_nir_move_interpolation_to_top);
brw_postprocess_nir(nir, compiler, true, debug_enabled,
key->base.robust_buffer_access);
diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 3485be54f6f..4f363637e6e 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -452,6 +452,9 @@ brw_nir_lower_fs_inputs(nir_shader *nir,
if (devinfo->ver >= 11)
nir_lower_interpolation(nir, ~0);
+ if (!key->multisample_fbo)
+ nir_lower_single_sampled(nir);
+
nir_shader_instructions_pass(nir, lower_barycentric_at_offset,
nir_metadata_block_index |
nir_metadata_dominance,
More information about the mesa-commit
mailing list