OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_tex: Simplify lower_gradient logic

Browse Source 
Instead of having to call two different lower_gradient functions based
on whether or not it's a cube, just make lower_gradient handle cubes.
This significantly simplifies some of the logic.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Jason Ekstrand
2018-10-11 12:56:21 -05:00
parent caeffe7549
commit 5a968ae473
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/compiler/nir/nir_lower_tex.c
View File

@@ -562,6 +562,12 @@ lower_gradient_cube_map(nir_builder *b, nir_tex_instr *tex)
static void
lower_gradient(nir_builder *b, nir_tex_instr *tex)
{
/* Cubes are more complicated and have their own function */
if (tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE) {
lower_gradient_cube_map(b, tex);
return;
}
assert(tex->sampler_dim != GLSL_SAMPLER_DIM_CUBE);
assert(tex->op == nir_texop_txd);
assert(tex->dest.is_ssa);
@@ -832,19 +838,10 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
}
if (tex->op == nir_texop_txd &&
tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&
(options->lower_txd ||
options->lower_txd_cube_map ||
(tex->is_shadow && options->lower_txd_shadow))) {
lower_gradient_cube_map(b, tex);
progress = true;
continue;
}
if (tex->op == nir_texop_txd &&
(options->lower_txd ||
(options->lower_txd_shadow &&
tex->is_shadow && tex->sampler_dim != GLSL_SAMPLER_DIM_CUBE))) {
(options->lower_txd_shadow && tex->is_shadow) ||
(options->lower_txd_cube_map &&
tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE))) {
lower_gradient(b, tex);
progress = true;
continue;