From 0cae65d494492c03af8063ee34130dd043b627bb Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Wed, 16 Jul 2014 09:09:50 +0200
Subject: [PATCH] d3d9/tests: Get rid of struct vertex_shortcolor.

---
 dlls/d3d9/tests/visual.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index e099f9c5667..6a475a63953 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -7943,10 +7943,6 @@ done:
     DestroyWindow(window);
 }
 
-struct vertex_shortcolor {
-    float x, y, z;
-    unsigned short r, g, b, a;
-};
 struct vertex_floatcolor {
     float x, y, z;
     float r, g, b, a;
@@ -8021,12 +8017,17 @@ static void fixed_function_decl_test(void)
         {{ 0.0f,  0.0f, 0.1f}, 0x00ffff00},
         {{ 0.0f,  1.0f, 0.1f}, 0x00ffff00},
     };
-    static const struct vertex_shortcolor quad3[] =     /* short */
+    static const struct
     {
-        { 0.0f, -1.0f,   0.1f,                          0x0000, 0x0000, 0xffff, 0xffff},
-        { 0.0f,  0.0f,   0.1f,                          0x0000, 0x0000, 0xffff, 0xffff},
-        { 1.0f, -1.0f,   0.1f,                          0x0000, 0x0000, 0xffff, 0xffff},
-        { 1.0f,  0.0f,   0.1f,                          0x0000, 0x0000, 0xffff, 0xffff},
+        struct vec3 position;
+        struct { unsigned short x, y, z, w; } color;
+    }
+    quad3[] =                  /* USHORT4N */
+    {
+        {{0.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}},
+        {{0.0f,  0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}},
+        {{1.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}},
+        {{1.0f,  0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}},
     };
     static const struct vertex_floatcolor quad4[] =
     {