graw: fix tests to build on msvc again.

Should fix https://bugs.freedesktop.org/show_bug.cgi?id=40997

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/tests/graw/clear.c b/src/gallium/tests/graw/clear.c
index 9c9eeebe0af3956e0239fb5ca3c749df1a0804ef..c6c645e8a46f3a72548a055763a78a3bc88294f3 100644 (file)
--- a/src/gallium/tests/graw/clear.c
+++ b/src/gallium/tests/graw/clear.c
@@ -26,7 +26,7 @@ static void *window = NULL;
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {1, 0, 1, 1} };
+   union pipe_color_union clear_color = { {1, 0, 1, 1} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    ctx->flush(ctx, NULL);

diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index 47bc101846fa62dbb15f7072da332aebeaa7335c..d9e70f074768a902a39c36e65a7d3d4d726c5db1 100644 (file)
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -272,7 +272,7 @@ static void set_fragment_shader( const char *filename )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {.1,.3,.5,0} };
+   union pipe_color_union clear_color = { {.1,.3,.5,0} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);

diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c
index 511f5d53438f7a1d321933690a40ff2e200756ab..e95306e82721a9f378ee8c35e74f60c57daef0d9 100644 (file)
--- a/src/gallium/tests/graw/gs-test.c
+++ b/src/gallium/tests/graw/gs-test.c
@@ -331,7 +331,7 @@ static void set_geometry_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {.1,.3,.5,0} };
+   union pipe_color_union clear_color = { {.1,.3,.5,0} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    if (draw_strip)

diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c
index 152e1edb3fd11afcd3b0d12ce26c082f1152f3eb..561234694f4e29a585e00264ae2763afd5e81b8c 100644 (file)
--- a/src/gallium/tests/graw/quad-sample.c
+++ b/src/gallium/tests/graw/quad-sample.c
@@ -146,7 +146,7 @@ static void set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {.5,.5,.5,1} };
+   union pipe_color_union clear_color = { {.5,.5,.5,1} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);

diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c
index ca742a699d4625ca665d33252181f82b2971b252..a2749cab3695d0dbb267bc89b7952ec4aed5baca 100644 (file)
--- a/src/gallium/tests/graw/quad-tex.c
+++ b/src/gallium/tests/graw/quad-tex.c
@@ -143,7 +143,7 @@ static void set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {.5,.5,.5,1} };
+   union pipe_color_union clear_color = { {.5,.5,.5,1} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);

diff --git a/src/gallium/tests/graw/shader-leak.c b/src/gallium/tests/graw/shader-leak.c
index 098faec5896cac17bba11d971f0cd712fbe8b495..57cd2dc2b12ded168bc3a3989eaf900b9f08b626 100644 (file)
--- a/src/gallium/tests/graw/shader-leak.c
+++ b/src/gallium/tests/graw/shader-leak.c
@@ -137,7 +137,7 @@ set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {0,0,0,1} };
+   union pipe_color_union clear_color = { {0,0,0,1} };
    int i;
 
    printf("Creating %d shaders\n", num_iters);

diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c
index 3c9e56882e5bc1d2be969aa2263344710430ea30..43486636ff780ac97a17fe61c9395c6039bcda03 100644 (file)
--- a/src/gallium/tests/graw/tri-gs.c
+++ b/src/gallium/tests/graw/tri-gs.c
@@ -159,7 +159,7 @@ static void set_geometry_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {1,0,1,1} };
+   union pipe_color_union clear_color = { {1,0,1,1} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);

diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c
index 50389e087258c21f467ce51e3b4af1c11c1e775f..521dab04da9d842aa8639ef17cb65631a442a156 100644 (file)
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -196,7 +196,7 @@ static void set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {1,0,1,1} };
+   union pipe_color_union clear_color = { {1,0,1,1} };
    struct pipe_draw_info info;
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);

diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c
index 2b779ff87048493797ca5bce9244a3606c0afa51..11f8bb35cafc2937f2a351e0f71bc813dc24be26 100644 (file)
--- a/src/gallium/tests/graw/tri.c
+++ b/src/gallium/tests/graw/tri.c
@@ -136,7 +136,7 @@ static void set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {1,0,1,1} };
+   union pipe_color_union clear_color = { {1,0,1,1} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);

diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index b98c8f5356287352e28f960a2252105bee4ff614..74b3273192c0ab8f6a43f923a7a92c7dfcdd3319 100644 (file)
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -223,7 +223,7 @@ static void set_fragment_shader( void )
 
 static void draw( void )
 {
-   union pipe_color_union clear_color = { .f = {.1,.3,.5,0} };
+   union pipe_color_union clear_color = { {.1,.3,.5,0} };
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
    util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices));