From 76df6cd321e9552c4a803a0381db60729206dce1 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Sun, 14 Sep 2025 20:52:14 +0200 Subject: [PATCH] nir: remove has_ddx_intrinsics option I thought this was already gone but apparently not quite. Reviewed-by: Rhys Perry Part-of: --- src/compiler/nir/nir_shader_compiler_options.h | 7 ------- src/gallium/drivers/i915/i915_screen.c | 1 - src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 1 - 3 files changed, 9 deletions(-) diff --git a/src/compiler/nir/nir_shader_compiler_options.h b/src/compiler/nir/nir_shader_compiler_options.h index 9b06d1ef02a..ad5f7c69da0 100644 --- a/src/compiler/nir/nir_shader_compiler_options.h +++ b/src/compiler/nir/nir_shader_compiler_options.h @@ -745,13 +745,6 @@ typedef struct nir_shader_compiler_options { */ bool discard_is_demote; - /** - * Whether the new-style derivative intrinsics are supported. If false, - * legacy ALU derivative ops will be emitted. This transitional option will - * be removed once all drivers are converted to derivative intrinsics. - */ - bool has_ddx_intrinsics; - /** Whether derivative intrinsics must be scalarized. */ bool scalarize_ddx; diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c index 57dd9b4c179..84b61fa5f6e 100644 --- a/src/gallium/drivers/i915/i915_screen.c +++ b/src/gallium/drivers/i915/i915_screen.c @@ -171,7 +171,6 @@ static const struct nir_shader_compiler_options gallivm_nir_options = { /* .support_16bit_alu = true, */ .support_indirect_inputs = (uint8_t)BITFIELD_MASK(MESA_SHADER_STAGES), .support_indirect_outputs = (uint8_t)BITFIELD_MASK(MESA_SHADER_STAGES), - .has_ddx_intrinsics = true, .no_integers = true, }; diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp index bfec384b830..632006a3e92 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp @@ -3672,7 +3672,6 @@ nvir_nir_shader_compiler_options(int chipset, uint8_t shader_type) ((chipset >= NVISA_GV100_CHIPSET) ? nir_lower_ddiv : 0) ); op.discard_is_demote = true; - op.has_ddx_intrinsics = true; op.scalarize_ddx = true; op.support_indirect_inputs = (uint8_t)BITFIELD_MASK(MESA_SHADER_GEOMETRY + 1); op.support_indirect_outputs = (uint8_t)BITFIELD_MASK(MESA_SHADER_GEOMETRY + 1);