[PATCH 4/5] ddraw/tests: Get rid of struct tvertex.
Henri Verbeet
hverbeet at codeweavers.com
Tue Jul 1 00:52:32 CDT 2014
---
dlls/ddraw/tests/visual.c | 62 ++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index f24c6cc..7be1f34 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -28,6 +28,11 @@ struct vec3
float x, y, z;
};
+struct vec4
+{
+ float x, y, z, w;
+};
+
static HWND window;
static IDirectDraw7 *DirectDraw;
static IDirectDrawSurface7 *Surface;
@@ -269,12 +274,6 @@ static void set_viewport_size(IDirect3DDevice7 *device)
return;
}
-struct tvertex
-{
- float x, y, z, w;
- DWORD diffuse;
-};
-
struct nvertex
{
float x, y, z;
@@ -2981,33 +2980,38 @@ out:
*/
static void depth_clamp_test(IDirect3DDevice7 *device)
{
- struct tvertex quad1[] =
+ struct
{
- { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f},
- {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f},
- { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f},
- {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f},
- };
- struct tvertex quad2[] =
+ struct vec4 position;
+ DWORD diffuse;
+ }
+ quad1[] =
{
- { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814},
- {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814},
- { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814},
- {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814},
- };
- struct tvertex quad3[] =
+ {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f},
+ {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f},
+ {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f},
+ {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f},
+ },
+ quad2[] =
{
- {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff},
- {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff},
- {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff},
- {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff},
- };
- struct tvertex quad4[] =
+ {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814},
+ {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814},
+ {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814},
+ {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814},
+ },
+ quad3[] =
+ {
+ {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff},
+ {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff},
+ {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff},
+ {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff},
+ },
+ quad4[] =
{
- { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff},
- {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff},
- { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff},
- {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff},
+ {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff},
+ {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff},
+ {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff},
+ {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff},
};
struct
{
--
1.7.10.4
More information about the wine-patches
mailing list