wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Tag wine-1.7.55 : Alexandre Julliard : Release 1.7.55
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: refs/tags/wine-1.7.55 Tag: f59ef168c969e0c9a971e0e07385899286f786a4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f59ef168c969e0c9a971e0e07385… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 23:32:40 2015 +0900 Release 1.7.55

1 0

Alexandre Julliard : Release 1.7.55.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: a786dca935c3e9b3d85853db4b61700e590a1c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a786dca935c3e9b3d85853db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 23:32:40 2015 +0900 Release 1.7.55. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 947 ++++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 532 insertions(+), 435 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a786dca935c3e9b3d8585…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetRenderTargets().
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 860433c79ad3f2f00554c0826240881b8c60d075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860433c79ad3f2f00554c0826… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:42 2015 +0100 d3d11: Implement d3d11_immediate_context_OMGetRenderTargets(). 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 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 78a6b1d..0c146e4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1444,8 +1444,48 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_rendertarget_view *wined3d_view; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view); + + wined3d_mutex_lock(); + if (render_target_views) + { + struct d3d_rendertarget_view *view_impl; + unsigned int i; + + for (i = 0; i < render_target_view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + render_target_views[i] = NULL; + continue; + } + + render_target_views[i] = &view_impl->ID3D11RenderTargetView_iface; + ID3D11RenderTargetView_AddRef(render_target_views[i]); + } + } + + if (depth_stencil_view) + { + struct d3d_depthstencil_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + *depth_stencil_view = NULL; + } + else + { + *depth_stencil_view = &view_impl->ID3D11DepthStencilView_iface; + ID3D11DepthStencilView_AddRef(*depth_stencil_view); + } + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews(

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexedInstanced().
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: ea7c30e83185869c0362ff049b1ce391f117351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7c30e83185869c0362ff049… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:40 2015 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexedInstanced(). 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 325c006..78a6b1d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -368,10 +368,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " - "base_vertex_location %d, start_instance_location %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " + "base_vertex_location %d, start_instance_location %u.\n", iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); + + wined3d_mutex_lock(); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive_instanced(device->wined3d_device, start_index_location, + instance_index_count, start_instance_location, instance_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexed().
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: f282e10e00d664ccb55147485e3b088469e6b428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f282e10e00d664ccb55147485… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:39 2015 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexed(). 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d357c2a..325c006 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -227,8 +227,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - FIXME("iface %p, index_count %u, start_index_location %u, base_vertex_location %d stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); + + wined3d_mutex_lock(); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext *iface,

1 0

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

13 Nov '15

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 13 Nov '15

13 Nov '15

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 13 Nov '15

13 Nov '15

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 13 Nov '15

13 Nov '15

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

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

13 Nov '15

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

← Newer
1
...
22
23
24
25
26
27
28
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015