diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
index ba68cd7e2ac..73a54681ff6 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp
@@ -907,7 +907,7 @@ Lower64BitToVec2::lower(nir_instr *instr)
    case nir_instr_type_load_const:  {
       auto lc = nir_instr_as_load_const(instr);
       assert(lc->def.num_components < 3);
-      nir_const_value val[4] = {0};
+      nir_const_value val[4] = { { 0 } };
       for (uint i = 0; i < lc->def.num_components; ++i) {
          uint64_t v = lc->value[i].u64;
          val[0].u32 = v & 0xffffffff;
@@ -1325,7 +1325,7 @@ r600_lower_64bit_intrinsic(nir_builder *b, nir_intrinsic_instr *instr)
       b->cursor = nir_before_instr(&instr->instr);
 
       nir_ssa_def *src0 = instr->src[0].ssa;
-      nir_ssa_scalar channels[4] = { 0 };
+      nir_ssa_scalar channels[4] = { { 0 } };
       for (int i = 0; i < instr->num_components; i++)
          channels[i] = nir_get_ssa_scalar(src0, i);
 
diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
index 5073028f78f..1667281c709 100644
--- a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
+++ b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
@@ -3063,7 +3063,7 @@ Shader *TestShader::from_string(const std::string& s)
    istringstream is(s);
    string line;
 
-   r600_shader_key key = {0};
+   r600_shader_key key = { { 0 } };
    key.ps.nr_cbufs = 1;
 
    do {