Mesa (master): gallium/util: silence warning about array initializers

Brian Paul brianp at kemper.freedesktop.org
Thu Jan 14 16:23:50 UTC 2010


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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 13 18:24:15 2010 -0700

gallium/util: silence warning about array initializers

---

 src/gallium/auxiliary/util/u_blitter.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 46b4706..249a037 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -379,9 +379,16 @@ static void blitter_set_texcoords_cube(struct blitter_context_priv *ctx,
    float t1 = y1 / (float)surf->height;
    float s2 = x2 / (float)surf->width;
    float t2 = y2 / (float)surf->height;
-   const float st[4][2] = {
-      {s1, t1}, {s2, t1}, {s2, t2}, {s1, t2}
-   };
+   float st[4][2];
+
+   st[0][0] = s1;
+   st[0][1] = t1;
+   st[1][0] = s2;
+   st[1][1] = t1;
+   st[2][0] = s2;
+   st[2][1] = t2;
+   st[3][0] = s1;
+   st[3][1] = t2;
 
    util_map_texcoords2d_onto_cubemap(surf->face,
                                      /* pointer, stride in floats */




More information about the mesa-commit mailing list