nir/constant_folding: Break TXB folding into a helper function

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16171>
This commit is contained in:
Jason Ekstrand
2022-04-26 11:28:36 -05:00
committed by Marge Bot
parent 4f7de83110
commit 9332598b26

View File

@@ -306,30 +306,41 @@ try_fold_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
} }
static bool static bool
try_fold_tex(nir_builder *b, nir_tex_instr *tex) try_fold_txb_to_tex(nir_builder *b, nir_tex_instr *tex)
{ {
/* txb with a bias of constant zero is just tex. */ assert(tex->op == nir_texop_txb);
if (tex->op == nir_texop_txb) {
const int bias_idx = nir_tex_instr_src_index(tex, nir_tex_src_bias);
/* nir_to_tgsi_lower_tex mangles many kinds of texture instructions, const int bias_idx = nir_tex_instr_src_index(tex, nir_tex_src_bias);
* including txb, into invalid states. It removes the special
* parameters and appends the values to the texture coordinate.
*/
if (bias_idx < 0)
return false;
if (nir_src_is_const(tex->src[bias_idx].src) && /* nir_to_tgsi_lower_tex mangles many kinds of texture instructions,
nir_src_as_float(tex->src[bias_idx].src) == 0.0) { * including txb, into invalid states. It removes the special
nir_tex_instr_remove_src(tex, bias_idx); * parameters and appends the values to the texture coordinate.
tex->op = nir_texop_tex; */
return true; if (bias_idx < 0)
} return false;
if (nir_src_is_const(tex->src[bias_idx].src) &&
nir_src_as_float(tex->src[bias_idx].src) == 0.0) {
nir_tex_instr_remove_src(tex, bias_idx);
tex->op = nir_texop_tex;
return true;
} }
return false; return false;
} }
static bool
try_fold_tex(nir_builder *b, nir_tex_instr *tex)
{
bool progress = false;
/* txb with a bias of constant zero is just tex. */
if (tex->op == nir_texop_txb)
progress |= try_fold_txb_to_tex(b, tex);
return progress;
}
static bool static bool
try_fold_instr(nir_builder *b, nir_instr *instr, void *_state) try_fold_instr(nir_builder *b, nir_instr *instr, void *_state)
{ {