Mesa (master): nir/lower_tex_projector: Don't use designated initializers

Jason Ekstrand jekstrand at kemper.freedesktop.org
Tue Apr 7 18:50:46 UTC 2015


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Mon Apr  6 21:04:42 2015 -0700

nir/lower_tex_projector: Don't use designated initializers

These don't work in MSVC or in older versions of GCC

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89899
Reviewed-by: Mark Janes <mark.a.janes at intel.com>

---

 src/glsl/nir/nir_lower_tex_projector.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/nir/nir_lower_tex_projector.c b/src/glsl/nir/nir_lower_tex_projector.c
index 6327b23..6b0e9c3 100644
--- a/src/glsl/nir/nir_lower_tex_projector.c
+++ b/src/glsl/nir/nir_lower_tex_projector.c
@@ -109,7 +109,8 @@ nir_lower_tex_projector_block(nir_block *block, void *void_state)
       /* Now move the later tex sources down the array so that the projector
        * disappears.
        */
-      nir_src dead = {.is_ssa = false, .ssa = NULL};
+      nir_src dead;
+      memset(&dead, 0, sizeof dead);
       nir_instr_rewrite_src(&tex->instr, &tex->src[proj_index].src, dead);
       memmove(&tex->src[proj_index],
               &tex->src[proj_index + 1],




More information about the mesa-commit mailing list