From 9e23925991a90a7fed48976aa52d175c95f21318 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 28 Jul 2020 10:26:54 +0200 Subject: [PATCH] freedreno: Initialize lower_int64_options to a proper value 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 Reviewed-by: Rob Clark Acked-by: Jason Ekstrand Part-of: --- src/freedreno/ir3/ir3_nir.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c index b4b62ef99b3..dc707545bbb 100644 --- a/src/freedreno/ir3/ir3_nir.c +++ b/src/freedreno/ir3/ir3_nir.c @@ -71,6 +71,12 @@ static const nir_shader_compiler_options options = { .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: */ @@ -115,6 +121,12 @@ static const nir_shader_compiler_options options_a6xx = { .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 * -- 2.30.2