From 33d03e57ad2dc6056974786de067e817b5ad88d6 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Tue, 7 Feb 2023 19:08:47 -0800 Subject: [PATCH] intel/fs: use generated helpers for Wa_14013363432 / Wa_14012688258 Wa_14013363432 is a clone of Wa_14012688258. It does not apply to all gfx 12.5 platforms. Reviewed-by: Francisco Jerez Part-of: --- src/intel/compiler/brw_fs.cpp | 4 ++-- src/intel/compiler/brw_fs_nir.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index e481791..b22b32e 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -2849,9 +2849,9 @@ fs_visitor::opt_zero_samples() /* Gfx4 infers the texturing opcode based on the message length so we can't * change it. Gfx12.5 has restrictions on the number of coordinate * parameters that have to be provided for some texture types - * (Wa_14013363432). + * (Wa_14012688258). */ - if (devinfo->ver < 5 || devinfo->verx10 == 125) + if (devinfo->ver < 5 || intel_needs_workaround(devinfo, 14012688258)) return false; bool progress = false; diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 4709365..36d822e 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -6043,11 +6043,12 @@ fs_visitor::nir_emit_texture(const fs_builder &bld, nir_tex_instr *instr) break; } - /* Wa_14013363432: + /* Wa_14012688258: * * Compiler should send U,V,R parameters even if V,R are 0. */ - if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && devinfo->verx10 == 125) + if (instr->sampler_dim == GLSL_SAMPLER_DIM_CUBE && + intel_needs_workaround(devinfo, 14012688258)) assert(instr->coord_components >= 3u); break; case nir_tex_src_ddx: -- 2.7.4