November 2015 - Wine-Commits

Austin English : ntoskrnl.exe: Add ExDeletePagedLookasideList stub.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 4d08cbf7cbd8d0eadc4fa3c28f1d3bc80383c448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d08cbf7cbd8d0eadc4fa3c28… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:32:00 2015 +0100 ntoskrnl.exe: Add ExDeletePagedLookasideList stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f24901d..a845610 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1440,6 +1440,15 @@ void WINAPI ExDeleteNPagedLookasideList( PNPAGED_LOOKASIDE_LIST lookaside ) /*********************************************************************** + * ExDeletePagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExDeletePagedLookasideList( PPAGED_LOOKASIDE_LIST lookaside ) +{ + FIXME("(%p) stub\n", lookaside); +} + + +/*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ void WINAPI ExFreePool( void *ptr ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0210b37..5f75d4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -124,7 +124,7 @@ @ stub ExConvertExclusiveToSharedLite @ stdcall ExCreateCallback(ptr ptr long long) @ stdcall ExDeleteNPagedLookasideList(ptr) -@ stub ExDeletePagedLookasideList +@ stdcall ExDeletePagedLookasideList(ptr) @ stdcall ExDeleteResourceLite(ptr) @ stub ExDesktopObjectType @ stub ExDisableResourceBoostLite

1 0

Matteo Bruni : ddraw/tests: Port test_shademode() to ddraw4.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 7c1e53e0aca4852e4277fb01b004f2ca9e4ce92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1e53e0aca4852e4277fb01b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:47 2015 +0100 ddraw/tests: Port test_shademode() to ddraw4. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6ac725d..20cd989 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9992,6 +9992,147 @@ static void test_range_colorkey(void) DestroyWindow(window); } +static void test_shademode(void) +{ + IDirect3DVertexBuffer *vb_strip, *vb_list, *buffer; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirect3DViewport3 *viewport; + IDirect3DDevice3 *device; + D3DVERTEXBUFFERDESC desc; + IDirectDrawSurface4 *rt; + DWORD color0, color1; + void *data = NULL; + IDirect3D3 *d3d; + ULONG refcount; + UINT i, count; + HWND window; + HRESULT hr; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad_strip[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }, + quad_list[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static const struct + { + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + desc.dwNumVertices = sizeof(quad_strip) / sizeof(*quad_strip); + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &vb_strip, 0, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer_Lock(vb_strip, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer_Unlock(vb_strip); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + desc.dwNumVertices = sizeof(quad_list) / sizeof(*quad_list); + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &vb_list, 0, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer_Lock(vb_list, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer_Unlock(vb_list); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + buffer = tests[i].primtype == D3DPT_TRIANGLESTRIP ? vb_strip : vb_list; + count = tests[i].primtype == D3DPT_TRIANGLESTRIP ? 4 : 6; + hr = IDirect3DDevice3_DrawPrimitiveVB(device, tests[i].primtype, buffer, 0, count, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */ + color1 = get_surface_color(rt, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + } + + IDirect3DVertexBuffer_Release(vb_strip); + IDirect3DVertexBuffer_Release(vb_list); + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { IDirectDraw4 *ddraw; @@ -10077,4 +10218,5 @@ START_TEST(ddraw4) test_texcoordindex(); test_colorkey_precision(); test_range_colorkey(); + test_shademode(); }

1 0

Matteo Bruni : d3d8/tests: Port test_shademode() to d3d8.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 3bd99687a304b1b0c53b4452e3182d476bac64f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd99687a304b1b0c53b4452e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:45 2015 +0100 d3d8/tests: Port test_shademode() to d3d8. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1e2b16b..7029551 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8278,6 +8278,231 @@ static void test_uninitialized_varyings(void) DestroyWindow(window); } +static void test_shademode(void) +{ + IDirect3DVertexBuffer8 *vb_strip; + IDirect3DVertexBuffer8 *vb_list; + IDirect3DDevice8 *device; + DWORD color0, color1; + BYTE *data = NULL; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + DWORD vs, ps; + HWND window; + HRESULT hr; + UINT i; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), + D3DVSD_END() + }; + static const DWORD vs1_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40005, /* mov oD0, v5 */ + 0x0000ffff + }; + static const DWORD ps1_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad_strip[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }, + quad_list[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static const struct test_shader + { + DWORD version; + const DWORD *code; + } + novs = {0, NULL}, + vs_1 = {D3DVS_VERSION(1, 1), vs1_code}, + nops = {0, NULL}, + ps_1 = {D3DPS_VERSION(1, 1), ps1_code}; + static const struct + { + const struct test_shader *vs, *ps; + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {&novs, &nops, D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&vs_1, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&vs_1, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&vs_1, &ps_1, D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {&vs_1, &ps_1, D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&novs, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&vs_1, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_strip), 0, 0, D3DPOOL_MANAGED, &vb_strip); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_strip, 0, sizeof(quad_strip), &data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer8_Unlock(vb_strip); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_list), 0, 0, D3DPOOL_MANAGED, &vb_list); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_list, 0, sizeof(quad_list), &data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer8_Unlock(vb_list); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + if (tests[i].vs->version) + { + if (caps.VertexShaderVersion >= tests[i].vs->version) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, tests[i].vs->code, &vs, 0); + ok(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + skip("Shader version unsupported, skipping some tests.\n"); + continue; + } + } + else + { + vs = 0; + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Failed to set FVF, hr %#x.\n", hr); + } + if (tests[i].ps->version) + { + if (caps.PixelShaderVersion >= tests[i].ps->version) + { + hr = IDirect3DDevice8_CreatePixelShader(device, tests[i].ps->code, &ps); + ok(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + skip("Shader version unsupported, skipping some tests.\n"); + if (vs) + { + IDirect3DDevice8_SetVertexShader(device, 0); + IDirect3DDevice8_DeleteVertexShader(device, vs); + } + continue; + } + } + else + { + ps = 0; + } + + hr = IDirect3DDevice8_SetStreamSource(device, 0, + tests[i].primtype == D3DPT_TRIANGLESTRIP ? vb_strip : vb_list, sizeof(quad_strip[0])); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, tests[i].primtype, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = getPixelColor(device, 100, 100); /* Inside first triangle */ + color1 = getPixelColor(device, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + + IDirect3DDevice8_SetVertexShader(device, 0); + IDirect3DDevice8_SetPixelShader(device, 0); + + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + if (vs) + IDirect3DDevice8_DeleteVertexShader(device, vs); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(vb_strip); + IDirect3DVertexBuffer8_Release(vb_list); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8341,4 +8566,5 @@ START_TEST(visual) test_fixed_function_fvf(); test_flip(); test_uninitialized_varyings(); + test_shademode(); }

1 0

Matteo Bruni : wined3d: Enforce a stable texture units mapping.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: d6c814663353d4449e67b6392dce203ffd32b8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c814663353d4449e67b6392… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:42 2015 +0100 wined3d: Enforce a stable texture units mapping. The GLSL shader backend hardcodes the sampler uniforms at program link time, it can't handle a change in the mapping between draws with the same shader program. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 +++++++++++++++++-------------------- dlls/wined3d/glsl_shader.c | 9 ++------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9203905..80a9ba7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2542,6 +2542,7 @@ static void context_map_stage(struct wined3d_context *context, DWORD stage, DWOR DWORD i = context->rev_tex_unit_map[unit]; DWORD j = context->tex_unit_map[stage]; + TRACE("Mapping stage %u to unit %u.\n", stage, unit); context->tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; @@ -2688,8 +2689,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct } static BOOL context_unit_free_for_vs(const struct wined3d_context *context, - const struct wined3d_shader_resource_info *ps_resource_info, - const struct wined3d_shader_resource_info *vs_resource_info, DWORD unit) + const struct wined3d_shader_resource_info *ps_resource_info, DWORD unit) { DWORD current_mapping = context->rev_tex_unit_map[unit]; @@ -2711,8 +2711,7 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return !ps_resource_info[current_mapping].type; } - /* Used by a vertex sampler */ - return !vs_resource_info[current_mapping - MAX_FRAGMENT_SAMPLERS].type; + return TRUE; } static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) @@ -2738,18 +2737,15 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; if (vs_resource_info[i].type) { - if (context->tex_unit_map[vsampler_idx] != WINED3D_UNMAPPED_STAGE) - { - /* Already mapped somewhere */ - continue; - } - while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, vs_resource_info, start)) + if (context_unit_free_for_vs(context, ps_resource_info, start)) { - context_map_stage(context, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + if (context->tex_unit_map[vsampler_idx] != start) + { + context_map_stage(context, vsampler_idx, start); + context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + } --start; break; @@ -2757,6 +2753,8 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } + if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } } @@ -2765,13 +2763,12 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s { BOOL vs = use_vs(state); BOOL ps = use_ps(state); - /* - * Rules are: - * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but - * that would be really messy and require shader recompilation - * -> When the mapping of a stage is changed, sampler and ALL texture stage states have - * to be reset. Because of that try to work with a 1:1 mapping as much as possible - */ + + /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders + * need a 1:1 map at the moment. + * When the mapping of a stage is changed, sampler and ALL texture stage + * states have to be reset. */ + if (ps) context_map_psamplers(context, state); else diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e7090..abfaef8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7095,13 +7095,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - /* Load the vertex and pixel samplers now. The function that finds the mappings makes sure - * that it stays the same for each vertexshader-pixelshader pair(=linked glsl program). If - * a pshader with fixed function pipeline is used there are no vertex samplers, and if a - * vertex shader with fixed function pixel processing is used we make sure that the card - * supports enough samplers to allow the max number of vertex samplers with all possible - * fixed function fragment processing setups. So once the program is linked these samplers - * won't change. */ + /* Texture unit mapping is set up to be the same each time the shader + * program is used so we can hardcode the sampler uniform values. */ shader_glsl_load_samplers(gl_info, priv, context->tex_unit_map, program_id); entry->constant_update_mask = 0;

1 0

Matteo Bruni : wined3d: Set default texture units mapping for vertex shader samplers when possible.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: e449f90b20cf9715df4644867efc121776da6b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e449f90b20cf9715df4644867… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:40 2015 +0100 wined3d: Set default texture units mapping for vertex shader samplers when possible. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1692d0d..ff2ff4e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1509,7 +1509,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { - if (s < gl_info->limits.fragment_samplers) + if (s < gl_info->limits.combined_samplers) { ret->tex_unit_map[s] = s; ret->rev_tex_unit_map[s] = s;

1 0

Daniel Lehman : msvcp120: Implement _Cnd_* functions.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: df096e6b60e268eb7c699cf80d113866ae30fbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df096e6b60e268eb7c699cf80… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 3 17:10:16 2015 -0800 msvcp120: Implement _Cnd_* functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 12 +-- dlls/msvcp120/msvcp120.spec | 12 +-- dlls/msvcp120/tests/msvcp120.c | 184 +++++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 12 +-- dlls/msvcp90/misc.c | 104 ++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp_main.c | 1 + 7 files changed, 308 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df096e6b60e268eb7c699…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IASetIndexBuffer().
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: a277a9c4bf16a0aea25346651ba137bee5cdae9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a277a9c4bf16a0aea25346651… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:38 2015 +0100 d3d11: Implement d3d11_immediate_context_IASetIndexBuffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5683621..d357c2a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -341,8 +341,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, DXGI_FORMAT format, UINT offset) { - FIXME("iface %p, buffer %p, format %s, offset %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); + + TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); + + if (offset) + FIXME("offset %u not supported.\n", offset); + + wined3d_mutex_lock(); + wined3d_device_set_index_buffer(device->wined3d_device, + buffer_impl ? buffer_impl->wined3d_buffer : NULL, + wined3dformat_from_dxgi_format(format)); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D11DeviceContext *iface,

1 0

Matteo Bruni : wined3d: Flat shading emulation for core contexts.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 0985606be4016280494b0ac5fb4becb576e60ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0985606be4016280494b0ac5f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:50 2015 +0100 wined3d: Flat shading emulation for core contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 56 +++++++++++++++++++++++++----------- dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/shader.c | 10 ++++++- dlls/wined3d/state.c | 4 +-- dlls/wined3d/utils.c | 16 +++++++++++ dlls/wined3d/wined3d_private.h | 17 ++++++++--- 9 files changed, 85 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0985606be4016280494b0…

1 0

Matteo Bruni : ddraw/tests: Port test_shademode() to ddraw1.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 36800e5217d5a0bff312e4f95236d781c2773e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36800e5217d5a0bff312e4f95… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:49 2015 +0100 ddraw/tests: Port test_shademode() to ddraw1. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b52bf48..4b99dd0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5492,6 +5492,7 @@ static void test_lighting(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } @@ -7729,6 +7730,148 @@ static void test_range_colorkey(void) DestroyWindow(window); } +static void test_shademode(void) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + const D3DLVERTEX *quad; + DWORD color0, color1; + UINT i, inst_length; + IDirectDraw *ddraw; + IDirect3D *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + static const D3DLVERTEX quad_strip[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffff0000}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xff0000ff}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}}, + }, + quad_list[] = + { + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xff0000ff}}, + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffff0000}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}}, + }; + static const struct + { + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x000000ff, 0x0000ff00}, + {D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + + quad = tests[i].primtype == D3DPT_TRIANGLESTRIP ? quad_strip : quad_list; + memcpy(exec_desc.lpData, quad, sizeof(quad_strip)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip); + emit_set_rs(&ptr, D3DRENDERSTATE_CLIPPING, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_FOGENABLE, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE); + emit_set_rs(&ptr, D3DRENDERSTATE_SHADEMODE, tests[i].shademode); + + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, 4); + if (tests[i].primtype == D3DPT_TRIANGLESTRIP) + emit_tquad(&ptr, 0); + else + emit_tquad_tlist(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(quad_strip); + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice2_BeginScene(device); + set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */ + color1 = get_surface_color(rt, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + } + + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_viewport(device, viewport); + destroy_material(background); + IDirectDrawSurface_Release(rt); + IDirect3D_Release(d3d); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { IDirectDraw *ddraw; @@ -7800,4 +7943,5 @@ START_TEST(ddraw1) test_color_fill(); test_colorkey_precision(); test_range_colorkey(); + test_shademode(); }

1 0

Matteo Bruni : ddraw/tests: Port test_shademode() to ddraw2.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 053c190ca1490e8d9ed11780b12a475c340fb1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=053c190ca1490e8d9ed11780b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:48 2015 +0100 ddraw/tests: Port test_shademode() to ddraw2. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 67a0e1e..20a342f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8858,6 +8858,124 @@ static void test_range_colorkey(void) DestroyWindow(window); } +static void test_shademode(void) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirect3DMaterial2 *background; + IDirect3DViewport2 *viewport; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + DWORD color0, color1; + IDirectDraw2 *ddraw; + D3DLVERTEX *quad; + IDirect3D2 *d3d; + ULONG refcount; + UINT i, count; + HWND window; + HRESULT hr; + static D3DLVERTEX quad_strip[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffff0000}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xff0000ff}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}}, + }, + quad_list[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffff0000}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xff0000ff}}, + + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xff0000ff}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}}, + }; + static const struct + { + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice2_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + quad = tests[i].primtype == D3DPT_TRIANGLESTRIP ? quad_strip : quad_list; + count = tests[i].primtype == D3DPT_TRIANGLESTRIP ? 4 : 6; + hr = IDirect3DDevice2_DrawPrimitive(device, tests[i].primtype, D3DVT_LVERTEX, quad, count, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */ + color1 = get_surface_color(rt, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + } + + destroy_viewport(device, viewport); + destroy_material(background); + IDirectDrawSurface_Release(rt); + IDirect3D2_Release(d3d); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw2) { IDirectDraw2 *ddraw; @@ -8936,4 +9054,5 @@ START_TEST(ddraw2) test_color_fill(); test_colorkey_precision(); test_range_colorkey(); + test_shademode(); }

1 0