[PATCH 4/5] d3d9/tests: Get rid of struct vertex_shortcolor.
Henri Verbeet
hverbeet at codeweavers.com
Wed Jul 16 02:09:50 CDT 2014
---
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[] =
{
--
1.7.10.4
More information about the wine-patches
mailing list