Henri Verbeet : d3d9/tests: Get rid of struct vertex_shortcolor.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0cae65d494492c03af8063ee34130dd043b627bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0cae65d494492c03af8063ee34...

Author: Henri Verbeet 
Date:   Wed Jul 16 09:09:50 2014 +0200

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 e099f9c..6a475a6 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
+    {
+        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},
+        {{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[] =
     {