From 2dc1189a9cb027be891381cf6712750a8469a818 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 6 Feb 2024 21:55:18 -0400 Subject: [PATCH] agx: rm unused backend nr_samples Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/compiler/agx_compile.h | 7 ------- src/asahi/lib/agx_meta.c | 1 - src/gallium/drivers/asahi/agx_state.c | 3 --- 3 files changed, 11 deletions(-) diff --git a/src/asahi/compiler/agx_compile.h b/src/asahi/compiler/agx_compile.h index 41e34a25b30..0e09bd77a51 100644 --- a/src/asahi/compiler/agx_compile.h +++ b/src/asahi/compiler/agx_compile.h @@ -216,13 +216,6 @@ struct agx_fs_shader_key { * tilebuffer loads (including blending). */ bool ignore_tib_dependencies; - - /* In a monolithic fragment shader or in a fragment epilogue, the number of - * samples in the tilebuffer. In a non-monolithic fragment shader, leave - * zero. This is used for the correct lowering of sample_mask instructions, - * to ensure that all samples are written out. Can be set conservatively. - */ - unsigned nr_samples; }; struct agx_shader_key { diff --git a/src/asahi/lib/agx_meta.c b/src/asahi/lib/agx_meta.c index 1d5c3444627..1c5f2d701fe 100644 --- a/src/asahi/lib/agx_meta.c +++ b/src/asahi/lib/agx_meta.c @@ -114,7 +114,6 @@ agx_build_background_shader(struct agx_meta_cache *cache, struct agx_shader_key compiler_key = { .fs.ignore_tib_dependencies = true, - .fs.nr_samples = key->tib.nr_samples, .reserved_preamble = key->reserved_preamble, }; diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index 4a41c1c5904..7ce79f11e80 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -2031,9 +2031,6 @@ agx_compile_variant(struct agx_device *dev, struct pipe_context *pctx, struct agx_shader_key base_key = {0}; - if (nir->info.stage == MESA_SHADER_FRAGMENT) - base_key.fs.nr_samples = key_->fs.nr_samples; - if (nir->info.stage == MESA_SHADER_VERTEX) { struct asahi_vs_shader_key *key = &key_->vs;