From 77aa11ca325112c8d1727f7bb7c2035500c72c1a Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 21 Mar 2019 14:47:06 -0700 Subject: [PATCH] nir: Fix anonymous union initialization with older GCC. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix this build error with GCC 4.4.7. CC nir/nir_opt_copy_prop_vars.lo nir/nir_opt_copy_prop_vars.c: In function ‘load_element_from_ssa_entry_value’: nir/nir_opt_copy_prop_vars.c:454: error: unknown field ‘ssa’ specified in initializer nir/nir_opt_copy_prop_vars.c:455: error: unknown field ‘def’ specified in initializer nir/nir_opt_copy_prop_vars.c:456: error: unknown field ‘component’ specified in initializer nir/nir_opt_copy_prop_vars.c:456: error: extra brace group at end of initializer nir/nir_opt_copy_prop_vars.c:456: error: (near initialization for ‘(anonymous).’) nir/nir_opt_copy_prop_vars.c:456: warning: excess elements in union initializer nir/nir_opt_copy_prop_vars.c:456: warning: (near initialization for ‘(anonymous).’) Fixes: 96c32d77763c ("nir/copy_prop_vars: handle load/store of vector elements") Signed-off-by: Vinson Lee Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109810 Reviewed-by: Andres Gomez Reviewed-by: Caio Marcelo de Oliveira Filho --- src/compiler/nir/nir_opt_copy_prop_vars.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 19003ccbd86..94bc8affd9e 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -451,10 +451,12 @@ load_element_from_ssa_entry_value(struct copy_prop_var_state *state, *value = (struct value) { .is_ssa = true, - .ssa = { - .def = { def }, - .component = { 0 }, - }, + { + .ssa = { + .def = { def }, + .component = { 0 }, + }, + } }; return true; -- 2.30.2