Mesa (master): nir: Fix invalid code for MSVC

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Oct 25 23:06:06 UTC 2019


Module: Mesa
Branch: master
Commit: 09ee11f5da6034586297bc45d90f252715c673aa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09ee11f5da6034586297bc45d90f252715c673aa

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Oct 25 13:56:23 2019 -0700

nir: Fix invalid code for MSVC

Fixes: ee2050b1111b65594f3470035f7b6f1330824684
       ("nir: Use BITSET for tracking varyings in lower_io_arrays")

---

 src/compiler/nir/nir_lower_io_arrays_to_elements.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
index ca9eb700f94..c2f65e73aa3 100644
--- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c
+++ b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
@@ -349,7 +349,7 @@ nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader,
    struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL);
    struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL);
 
-   BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {};
+   BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {{0}};
 
    lower_io_arrays_to_elements(shader, nir_var_shader_out,
                                indirects, split_outputs, true);
@@ -387,7 +387,7 @@ nir_lower_io_arrays_to_elements(nir_shader *producer, nir_shader *consumer)
    struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL);
    struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL);
 
-   BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {};
+   BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {{0}};
 
    create_indirects_mask(producer, indirects, nir_var_shader_out);
    create_indirects_mask(consumer, indirects, nir_var_shader_in);




More information about the mesa-commit mailing list