On Wed, Dec 19, 2018 at 5:51 AM Iago Toral Quiroga <ito...@igalia.com>
wrote:
> v2:
> - use nir_fmul_imm and nir_fadd_imm helpers (Jason)
> ---
> src/compiler/spirv/vtn_glsl450.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/src/compiler/spirv/vtn_glsl450.c
> b/src/compiler/spirv/vtn_glsl450.c
> index b54aeb9b217..f411d17cfe4 100644
> --- a/src/compiler/spirv/vtn_glsl450.c
> +++ b/src/compiler/spirv/vtn_glsl450.c
> @@ -202,17 +202,22 @@ build_log(nir_builder *b, nir_ssa_def *x)
> static nir_ssa_def *
> build_asin(nir_builder *b, nir_ssa_def *x, float p0, float p1)
> {
> + nir_ssa_def *one = nir_imm_floatN_t(b, 1.0f, x->bit_size);
> nir_ssa_def *abs_x = nir_fabs(b, x);
> +
> + nir_ssa_def *p0_plus_xp1 = nir_fadd_imm(b, nir_fmul_imm(b, abs_x, p1),
> p0);
> +
> + nir_ssa_def *expr_tail =
> + nir_fadd_imm(b, nir_fmul(b, abs_x,
> + nir_fadd_imm(b, nir_fmul(b, abs_x,
> +
> p0_plus_xp1),
> + M_PI_4f - 1.0f)),
> + M_PI_2f);
> +
> return nir_fmul(b, nir_fsign(b, x),
> - nir_fsub(b, nir_imm_float(b, M_PI_2f),
> - nir_fmul(b, nir_fsqrt(b, nir_fsub(b,
> nir_imm_float(b, 1.0f), abs_x)),
> - nir_fadd(b, nir_imm_float(b,
> M_PI_2f),
> - nir_fmul(b, abs_x,
> - nir_fadd(b,
> nir_imm_float(b, M_PI_4f - 1.0f),
> -
> nir_fmul(b, abs_x,
> -
> nir_fadd(b, nir_imm_float(b, p0),
> -
> nir_fmul(b, abs_x,
> -
> nir_imm_float(b, p1))))))))));
> + nir_fsub(b, nir_imm_float(b, M_PI_2f),
>
This needs to be nir_imm_floatN_t. Fortunately, I don't think it'll line
wrap.
> + nir_fmul(b, nir_fsqrt(b, nir_fsub(b,
> one, abs_x)),
> + expr_tail)));
> }
>
> /**
> --
> 2.17.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
