freedreno: Initialize lower_int64_options to a proper value
authorBoris Brezillon <boris.brezillon@collabora.com>
Tue, 28 Jul 2020 08:26:54 +0000 (10:26 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 30 Jul 2020 16:54:24 +0000 (16:54 +0000)
We're trying to get rid of the options argument passed to
nir_lower_int64() and use the nir_options.lower_int64_options instead.
But before we can do that we must patch nir_lower_int64() callers
that don't have this field properly set.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5588>

src/freedreno/ir3/ir3_nir.c

index b4b62ef99b385e88ccff453148c772f8dfab0166..dc707545bbb6a629aa25a15a4c775e7f312e1424 100644 (file)
@@ -71,6 +71,12 @@ static const nir_shader_compiler_options options = {
                .lower_to_scalar = true,
                .has_imul24 = true,
                .lower_wpos_pntc = true,
                .lower_to_scalar = true,
                .has_imul24 = true,
                .lower_wpos_pntc = true,
+
+               /* Only needed for the spirv_to_nir() pass done in ir3_cmdline.c
+                * but that should be harmless for GL since 64b is not
+                * supported there.
+                */
+               .lower_int64_options = (nir_lower_int64_options)~0,
 };
 
 /* we don't want to lower vertex_id to _zero_based on newer gpus: */
 };
 
 /* we don't want to lower vertex_id to _zero_based on newer gpus: */
@@ -115,6 +121,12 @@ static const nir_shader_compiler_options options_a6xx = {
                .has_imul24 = true,
                .max_unroll_iterations = 32,
                .lower_wpos_pntc = true,
                .has_imul24 = true,
                .max_unroll_iterations = 32,
                .lower_wpos_pntc = true,
+
+               /* Only needed for the spirv_to_nir() pass done in ir3_cmdline.c
+                * but that should be harmless for GL since 64b is not
+                * supported there.
+                */
+               .lower_int64_options = (nir_lower_int64_options)~0,
 };
 
 const nir_shader_compiler_options *
 };
 
 const nir_shader_compiler_options *