Skip to content

W
wine-winehq
Commit 59208edf authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d8/tests: Get rid of struct tvertex.

parent ab1a53c1
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 40 deletions
dlls/d3d8/tests/visual.c
View file @ 59208edf
...@@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND ...@@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND
return NULL; return NULL;
} }
struct tvertex
{
float x, y, z, w;
DWORD diffuse;
};
struct nvertex struct nvertex
{ {
float x, y, z; float x, y, z;
...@@ -1603,19 +1597,24 @@ static void z_range_test(void) ...@@ -1603,19 +1597,24 @@ static void z_range_test(void)
{{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff},
{{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff},
}; };
static const struct tvertex quad3[] = static const struct
{ {
{640.0f, 240.0f, -1.1f, 1.0f, 0xffffff00}, struct vec4 position;
{640.0f, 480.0f, -1.1f, 1.0f, 0xffffff00}, DWORD diffuse;
{ 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, }
{ 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, quad3[] =
};
static const struct tvertex quad4[] =
{ {
{640.0f, 240.0f, -1.1f, 1.0f, 0xff00ff00}, {{640.0f, 240.0f, -1.1f, 1.0f}, 0xffffff00},
{640.0f, 480.0f, -1.1f, 1.0f, 0xff00ff00}, {{640.0f, 480.0f, -1.1f, 1.0f}, 0xffffff00},
{ 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xffffff00},
{ 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xffffff00},
},
quad4[] =
{
{{640.0f, 240.0f, -1.1f, 1.0f}, 0xff00ff00},
{{640.0f, 480.0f, -1.1f, 1.0f}, 0xff00ff00},
{{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xff00ff00},
{{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xff00ff00},
}; };
static const DWORD shader_code[] = static const DWORD shader_code[] =
{ {
...@@ -2653,33 +2652,38 @@ static void depth_clamp_test(void) ...@@ -2653,33 +2652,38 @@ static void depth_clamp_test(void)
HWND window; HWND window;
HRESULT hr; HRESULT hr;
static const struct tvertex quad1[] = static const struct
{ {
{ 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, struct vec4 position;
{640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, DWORD diffuse;
{ 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, }
{640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, quad1[] =
};
static const struct tvertex quad2[] =
{ {
{ 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f},
{640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f},
{ 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f},
{640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f},
}; },
static const struct tvertex quad3[] = quad2[] =
{ {
{112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814},
{208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814},
{112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814},
{208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814},
}; },
static const struct tvertex quad4[] = 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}, {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff},
{112.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}, {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff},
{112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff},
}; };
static const struct static const struct
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment