diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2019-02-08 17:51:24 -0600 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-03-05 12:03:05 -0800 |
| commit | b6324bdfa5b2ecf59dfbd9eb57a40431374da8dd (patch) | |
| tree | 95c4ad3f6d46c50e22ab33b3b875aae0ab2e8ac9 /src/compiler | |
| parent | 8af5448418d8c4f3575ce88de49b8597b526d84f (diff) | |
| download | mesa-b6324bdfa5b2ecf59dfbd9eb57a40431374da8dd.tar.gz mesa-b6324bdfa5b2ecf59dfbd9eb57a40431374da8dd.tar.bz2 mesa-b6324bdfa5b2ecf59dfbd9eb57a40431374da8dd.zip | |
intel,nir: Lower TXD with min_lod when the sampler index is not < 16
When we have a larger sampler index, we get into the "high sampler"
scenario and need an instruction header. Even in SIMD8, this pushes the
instruction over the sampler message size maximum of 11 registers.
Instead, we have to lower TXD to TXL.
Fixes: cb98e0755f8d "intel/fs: Support min_lod parameters on texture..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 5c96120b5ce158fea28d751d8a55b5e4d80df4f3)
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir.h | 6 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_tex.c | 21 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index c4c57c391de..23af8ea7dcd 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -3139,6 +3139,12 @@ typedef struct nir_lower_tex_options { bool lower_txd_offset_clamp; /** + * If true, lower nir_texop_txd with min_lod to a nir_texop_txl if the + * sampler index is not statically determinable to be less than 16. + */ + bool lower_txd_clamp_if_sampler_index_not_lt_16; + + /** * If true, apply a .bagr swizzle on tg4 results to handle Broadcom's * mixed-up tg4 locations. */ diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index a618b86b34c..eedcc6b7b12 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -880,6 +880,25 @@ lower_tex_packing(nir_builder *b, nir_tex_instr *tex, } static bool +sampler_index_lt(nir_tex_instr *tex, unsigned max) +{ + assert(nir_tex_instr_src_index(tex, nir_tex_src_sampler_deref) == -1); + + unsigned sampler_index = tex->sampler_index; + + int sampler_offset_idx = + nir_tex_instr_src_index(tex, nir_tex_src_sampler_offset); + if (sampler_offset_idx >= 0) { + if (!nir_src_is_const(tex->src[sampler_offset_idx].src)) + return false; + + sampler_index += nir_src_as_uint(tex->src[sampler_offset_idx].src); + } + + return sampler_index < max; +} + +static bool nir_lower_tex_block(nir_block *block, nir_builder *b, const nir_lower_tex_options *options) { @@ -995,6 +1014,8 @@ nir_lower_tex_block(nir_block *block, nir_builder *b, (options->lower_txd_shadow && tex->is_shadow) || (options->lower_txd_shadow_clamp && tex->is_shadow && has_min_lod) || (options->lower_txd_offset_clamp && has_offset && has_min_lod) || + (options->lower_txd_clamp_if_sampler_index_not_lt_16 && + has_min_lod && !sampler_index_lt(tex, 16)) || (options->lower_txd_cube_map && tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE) || (options->lower_txd_3d && |