From ab4c2990ed4e0e995513582b2135b7505bec908b Mon Sep 17 00:00:00 2001 From: Amber Date: Tue, 24 Jan 2023 11:56:49 +0100 Subject: [PATCH] intel/compiler: use lower_image_samples_to_one Reviewed-by: Faith Ekstrand Reviewer-by: Alyssa Rosenzweig Signed-off-by: Amber Amber Part-of: --- src/intel/compiler/brw_fs_nir.cpp | 5 ----- src/intel/compiler/brw_nir_lower_storage_image.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 3ebbca88d9e..2d5232263a2 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -4623,11 +4623,6 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr break; } - case nir_intrinsic_image_samples: - /* The driver does not support multi-sampled images. */ - bld.MOV(retype(dest, BRW_REGISTER_TYPE_D), brw_imm_d(1)); - break; - case nir_intrinsic_load_reloc_const_intel: { uint32_t id = nir_intrinsic_param_idx(instr); bld.emit(SHADER_OPCODE_MOV_RELOC_IMM, diff --git a/src/intel/compiler/brw_nir_lower_storage_image.c b/src/intel/compiler/brw_nir_lower_storage_image.c index df30bcf04f0..5d872d12ff8 100644 --- a/src/intel/compiler/brw_nir_lower_storage_image.c +++ b/src/intel/compiler/brw_nir_lower_storage_image.c @@ -725,6 +725,7 @@ brw_nir_lower_storage_image(nir_shader *shader, const nir_lower_image_options image_options = { .lower_cube_size = true, + .lower_image_samples_to_one = true, }; progress |= nir_lower_image(shader, &image_options);