Henri Verbeet : d3d9/tests: Get rid of struct nvertex.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jul 16 13:59:55 CDT 2014
Module: wine
Branch: master
Commit: 1ccf7f5e745543744e4ba301f83e5d9da015d362
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccf7f5e745543744e4ba301f83e5d9da015d362
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jul 16 09:09:49 2014 +0200
d3d9/tests: Get rid of struct nvertex.
---
dlls/d3d9/tests/visual.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index caf8f75..e099f9c 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -209,13 +209,6 @@ static void cleanup_device(IDirect3DDevice9 *device)
}
}
-struct nvertex
-{
- float x, y, z;
- float nx, ny, nz;
- DWORD diffuse;
-};
-
static void test_sanity(void)
{
IDirect3DDevice9 *device;
@@ -303,19 +296,25 @@ static void lighting_test(void)
{{-1.0f, 1.0f, 0.1f}, 0x8000ff00},
{{ 1.0f, 1.0f, 0.1f}, 0x80000000},
};
- static const struct nvertex unlitnquad[] =
+ static const struct
{
- { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
- { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
- { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
- { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff},
- };
- static const struct nvertex litnquad[] =
+ struct vec3 position;
+ struct vec3 normal;
+ DWORD diffuse;
+ }
+ unlitnquad[] =
+ {
+ {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
+ {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
+ {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
+ {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
+ },
+ litnquad[] =
{
- { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
- { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
- { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
- { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00},
+ {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
+ {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
+ {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
+ {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
};
static const WORD Indices[] = {0, 1, 2, 2, 3, 0};
More information about the wine-cvs
mailing list