Skip to content

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

d3d8/tests: Get rid of struct nvertex.

parent 59208edf
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
dlls/d3d8/tests/device.c
View file @ 4cb91a69
...@@ -1919,17 +1919,18 @@ static void test_render_zero_triangles(void) ...@@ -1919,17 +1919,18 @@ static void test_render_zero_triangles(void)
HWND window; HWND window;
HRESULT hr; HRESULT hr;
struct nvertex static const struct
{ {
float x, y, z; struct vec3 position;
float nx, ny, nz; struct vec3 normal;
DWORD diffuse; DWORD diffuse;
} quad[] = }
quad[] =
{ {
{ 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, {{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}, {{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, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
{ 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
}; };
window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW,
......
dlls/d3d8/tests/visual.c
View file @ 4cb91a69
...@@ -133,13 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND ...@@ -133,13 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND
return NULL; return NULL;
} }
struct nvertex
{
float x, y, z;
float nx, ny, nz;
DWORD diffuse;
};
static void test_sanity(void) static void test_sanity(void)
{ {
IDirect3DDevice8 *device; IDirect3DDevice8 *device;
...@@ -212,19 +205,25 @@ static void lighting_test(void) ...@@ -212,19 +205,25 @@ static void lighting_test(void)
{{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00},
{{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00},
}; };
static const struct nvertex unlitnquad[] = static const struct
{ {
{ 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, struct vec3 position;
{ 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, struct vec3 normal;
{ 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, DWORD diffuse;
{ 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, }
}; unlitnquad[] =
static const struct nvertex litnquad[] = {
{{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, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
{ 0.0f, 1.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, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00},
{ 1.0f, 0.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}; static const WORD Indices[] = {0, 1, 2, 2, 3, 0};
static const D3DMATRIX mat = static const D3DMATRIX mat =
......
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