ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8/tests: Get rid of struct nvertex.

This commit is contained in:
Henri Verbeet 2014-07-15 08:43:58 +02:00 committed by Alexandre Julliard
parent 59208edffe
commit 4cb91a69b0
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3d8/tests/device.c
View File

@ -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,

35
dlls/d3d8/tests/visual.c
View File

@ -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)
{{ 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, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, {{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, 0xffffff00}, {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff},
{ 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}, 0xff0000ff},
{ 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, {{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},
}; };
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 =