October 2016 - Wine-Commits

Matteo Bruni : wined3d: Add ARB_fragment_coord_conventions extension.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: d9a9e45a24c230eb420c630916f41bd19192d324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a9e45a24c230eb420c63091… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:51 2016 +0200 wined3d: Add ARB_fragment_coord_conventions extension. 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/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50083d1..00e8d63 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -120,6 +120,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, + {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3556,6 +3557,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the * extension for core-only support. */ + {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 67ab6f7..3757b02 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, + ARB_FRAGMENT_COORD_CONVENTIONS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Nikolay Sivov : d2d1: Initial implementation of HWND render target.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: f4cacf774b4dc6a906a395fac1e667e06350848c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4cacf774b4dc6a906a395fac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 3 18:56:11 2016 +0300 d2d1: Initial implementation of HWND render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 17 +- dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 25 +- dlls/d2d1/hwnd_render_target.c | 869 +++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 9 +- dlls/d2d1/tests/d2d1.c | 51 +++ 7 files changed, 970 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4cacf774b4dc6a906a39…

1 0

Matteo Bruni : wined3d: Add ARB_viewport_array extension.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 86898c5c7b491450c9cfdc18c0df32e66fa73c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86898c5c7b491450c9cfdc18c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:54 2016 +0200 wined3d: Add ARB_viewport_array extension. 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/directx.c | 13 +++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d658692..b4394b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -172,6 +172,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, + {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, /* ATI */ {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER }, @@ -2829,6 +2830,17 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttrib4uivARB) USE_GL_FUNC(glVertexAttrib4usvARB) USE_GL_FUNC(glVertexAttribPointerARB) + /* GL_ARB_viewport_array */ + USE_GL_FUNC(glDepthRangeArrayv) + USE_GL_FUNC(glDepthRangeIndexed) + USE_GL_FUNC(glGetDoublei_v) + USE_GL_FUNC(glGetFloati_v) + USE_GL_FUNC(glScissorArrayv) + USE_GL_FUNC(glScissorIndexed) + USE_GL_FUNC(glScissorIndexedv) + USE_GL_FUNC(glViewportArrayv) + USE_GL_FUNC(glViewportIndexedf) + USE_GL_FUNC(glViewportIndexedfv) /* GL_ATI_fragment_shader */ USE_GL_FUNC(glAlphaFragmentOp1ATI) USE_GL_FUNC(glAlphaFragmentOp2ATI) @@ -3583,6 +3595,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, + {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3757b02..57fbea4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -107,6 +107,7 @@ enum wined3d_gl_extension ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, ARB_VERTEX_TYPE_2_10_10_10_REV, + ARB_VIEWPORT_ARRAY, /* ATI */ ATI_FRAGMENT_SHADER, ATI_SEPARATE_STENCIL,

1 0

André Hentschel : advapi32/tests: Don' t crash the service test on wow64 Wine.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 49f2d424aca936a7ae69ea62b2e941ca715ec714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f2d424aca936a7ae69ea62b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 3 14:12:39 2016 +0200 advapi32/tests: Don't crash the service test on wow64 Wine. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 81d2f74..c7e3154 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1401,7 +1401,7 @@ static void test_enum_svc(void) /* lpServiceName and lpDisplayName should always be filled */ ok(services[i].lpServiceName[0], "Expected a service name\n"); - ok(services[i].lpDisplayName[0], "Expected a display name\n"); + ok(services[i].lpDisplayName && services[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. @@ -1704,7 +1704,7 @@ static void test_enum_svc(void) /* lpServiceName and lpDisplayName should always be filled */ ok(exservices[i].lpServiceName[0], "Expected a service name\n"); - ok(exservices[i].lpDisplayName[0], "Expected a display name\n"); + ok(exservices[i].lpDisplayName && exservices[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the * same numbers as the contents of these structures.

1 0

Józef Kucia : wined3d: Bind dummy textures to all texture image units.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 7cb16e4dbe8dc7b6cc7949df8fe00f8876c4e5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb16e4dbe8dc7b6cc7949df8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:38 2016 +0200 wined3d: Bind dummy textures to all texture image units. 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/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a362247..e09c6fd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1514,9 +1514,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i, count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); + unsigned int i; - for (i = 0; i < count; ++i) + for (i = 0; i < gl_info->limits.combined_samplers; ++i) { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); checkGLcall("glActiveTexture");

1 0

Józef Kucia : wined3d: Use MAX_TEXTURES instead of magic number.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: a2ca4244bbc4d94ef91b11271453355479b8d0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ca4244bbc4d94ef91b11271… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:36 2016 +0200 wined3d: Use MAX_TEXTURES instead of magic number. 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/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f809e4a..f8ecb80 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5934,8 +5934,8 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */ - caps->MaxTextureBlendStages = 8; - caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES); } static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd32009..7a04f76 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1307,7 +1307,7 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen * The proper fix for this is not to use GL_ATI_fragment_shader on cards newer than the * r200 series and use an ARB or GLSL shader instead */ - caps->MaxTextureBlendStages = 8; + caps->MaxTextureBlendStages = MAX_TEXTURES; caps->MaxSimultaneousTextures = 6; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b0f3224..55cbdcf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9433,8 +9433,8 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, s | WINED3DTEXOPCAPS_LERP | WINED3DTEXOPCAPS_BUMPENVMAP | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE; - caps->MaxTextureBlendStages = 8; - caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES); } static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info)

1 0

Stefan Dösinger : ddraw/tests: Add D3DVIEWPORT2 transform tests.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: b44a5668f1304d182500059dbcb92ba3dba429c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44a5668f1304d182500059db… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:32 2016 +0100 ddraw/tests: Add D3DVIEWPORT2 transform tests. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b44a5668f1304d1825000…

1 0

Stefan Dösinger : ddraw: Use the clip space matrix in TransformVertices.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 58b82c67513e31dbb581633633bca936e217f0f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b82c67513e31dbb58163363… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:31 2016 +0100 ddraw: Use the clip space matrix in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 393113e..6364c21 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -395,18 +395,20 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; - D3DMATRIX view_mat, world_mat, mat; + D3DMATRIX view_mat, world_mat, proj_mat, mat; struct transform_vertices_vertex *in, *out; float x, y, z, w; unsigned int i; D3DHVERTEX *outH; + struct d3d_device *device = viewport->active_device; + BOOL activate = device->current_viewport != viewport; TRACE("iface %p, vertex_count %u, data %p, flags %#x, offscreen %p.\n", iface, dwVertexCount, data, dwFlags, offscreen); /* Tests on windows show that Windows crashes when this occurs, * so don't return the (intuitive) return value - if (!viewport->active_device) + if (!device) { WARN("No device active, returning D3DERR_VIEWPORTHASNODEVICE\n"); return D3DERR_VIEWPORTHASNODEVICE; @@ -424,14 +426,18 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, return DDERR_INVALIDPARAMS; } - wined3d_mutex_lock(); - wined3d_device_get_transform(viewport->active_device->wined3d_device, + if (activate) + viewport_activate(viewport, TRUE); + + wined3d_device_get_transform(device->wined3d_device, D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat); - wined3d_device_get_transform(viewport->active_device->wined3d_device, + wined3d_device_get_transform(device->wined3d_device, WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat); + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&proj_mat); multiply_matrix(&mat, &view_mat, &world_mat); - multiply_matrix(&mat, &viewport->active_device->legacy_projection, &mat); + multiply_matrix(&mat, &proj_mat, &mat); /* The pointer is not tested against NULL on Windows. */ if (dwFlags & D3DTRANSFORM_CLIPPED) @@ -453,22 +459,23 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if(dwFlags & D3DTRANSFORM_CLIPPED) { /* If clipping is enabled, Windows assumes that outH is - * a valid pointer - */ - outH[i].u1.hx = x; outH[i].u2.hy = y; outH[i].u3.hz = z; + * a valid pointer. */ + outH[i].u1.hx = (x - device->legacy_clipspace._41 * w) / device->legacy_clipspace._11; + outH[i].u2.hy = (y - device->legacy_clipspace._42 * w) / device->legacy_clipspace._22; + outH[i].u3.hz = (z - device->legacy_clipspace._43 * w) / device->legacy_clipspace._33; outH[i].dwFlags = 0; - if(x * vp.dvScaleX > ((float) vp.dwWidth * 0.5)) + if (x > w) outH[i].dwFlags |= D3DCLIP_RIGHT; - if(x * vp.dvScaleX <= -((float) vp.dwWidth) * 0.5) + if (x < -w) outH[i].dwFlags |= D3DCLIP_LEFT; - if(y * vp.dvScaleY > ((float) vp.dwHeight * 0.5)) + if (y > w) outH[i].dwFlags |= D3DCLIP_TOP; - if(y * vp.dvScaleY <= -((float) vp.dwHeight) * 0.5) + if (y < -w) outH[i].dwFlags |= D3DCLIP_BOTTOM; - if(z < 0.0) + if (z < 0.0f) outH[i].dwFlags |= D3DCLIP_FRONT; - if(z > 1.0) + if (z > w) outH[i].dwFlags |= D3DCLIP_BACK; *offscreen &= outH[i].dwFlags; @@ -491,13 +498,16 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, w = 1 / w; x *= w; y *= w; z *= w; - out->x = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; - out->y = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; + out->x = (x + 1.0f) * vp.dwWidth * 0.5 + vp.dwX; + out->y = (-y + 1.0f) * vp.dwHeight * 0.5 + vp.dwY; out->z = z; out->w = w; out->payload = in->payload; } + if (activate && device->current_viewport) + viewport_activate(device->current_viewport, TRUE); + wined3d_mutex_unlock(); TRACE("All done\n");

1 0

Stefan Dösinger : ddraw/tests: Test d3d2 and 3 drawing with non-standard viewports.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: 969368341e6a346a7ced058e79cc858c370e20a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969368341e6a346a7ced058e7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:29 2016 +0100 ddraw/tests: Test d3d2 and 3 drawing with non-standard viewports. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bf012e4..65376b3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10507,11 +10507,14 @@ struct transform_output static void test_transform_vertices(void) { IDirect3DDevice2 *device; + IDirectDrawSurface *rt; IDirectDraw2 *ddraw; ULONG refcount; HWND window; HRESULT hr; + D3DCOLOR color; IDirect3DViewport2 *viewport; + IDirect3DMaterial2 *background; static struct transform_input position_tests[] = { { 0.0f, 0.0f, 0.0f, 0.0f, 1, 2, 3, 4, 5}, @@ -10566,6 +10569,14 @@ static void test_transform_vertices(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, }; + static D3DLVERTEX quad[] = + { + {{-0.75f},{-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{-0.75f},{ 0.25f}, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, {-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, { 0.25f}, {0.0f}, 0, {0xffff0000}}, + }; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; for (i = 0; i < ARRAY_SIZE(out); ++i) @@ -10585,6 +10596,8 @@ static void test_transform_vertices(void) DestroyWindow(window); return; } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 256, 256); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); @@ -10942,7 +10955,54 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + /* Test how vertices are transformed during draws. */ + vp_data.dwX = 20; + vp_data.dwY = 20; + vp_data.dwWidth = 200; + vp_data.dwHeight = 400; + vp_data.dvScaleX = 20.0f; + vp_data.dvScaleY = 50.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to clear the render target, hr %#x.\n", hr); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 0.0f); + viewport_set_background(device, viewport, background); + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, 4, 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); + + color = get_surface_color(rt, 128, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 128, 147); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 147); + todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + color = get_surface_color(rt, 177, 217); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 217); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 177, 221); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); + IDirect3DMaterial2_Release(background); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9ac7a63..66301b5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11809,9 +11809,11 @@ struct transform_output static void test_transform_vertices(void) { IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; ULONG refcount; HWND window; HRESULT hr; + D3DCOLOR color; IDirect3DViewport3 *viewport; static struct transform_input position_tests[] = { @@ -11867,7 +11869,19 @@ static void test_transform_vertices(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, }; - + static struct + { + struct vec3 position; + DWORD color; + } + quad[] = + { + {{-0.75f, -0.5f , 0.0f}, 0xffff0000}, + {{-0.75f, 0.25f, 0.0f}, 0xffff0000}, + {{ 0.5f, -0.5f , 0.0f}, 0xffff0000}, + {{ 0.5f, 0.25f, 0.0f}, 0xffff0000}, + }; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; for (i = 0; i < ARRAY_SIZE(out); ++i) { @@ -11883,6 +11897,8 @@ static void test_transform_vertices(void) DestroyWindow(window); return; } + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 256, 256); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); @@ -12240,7 +12256,51 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + /* Test how vertices are transformed during draws. */ + vp_data.dwX = 20; + vp_data.dwY = 20; + vp_data.dwWidth = 200; + vp_data.dwHeight = 400; + vp_data.dvScaleX = 20.0f; + vp_data.dvScaleY = 50.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport3_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad, 4, 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); + + color = get_surface_color(rt, 128, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 128, 147); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 147); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + color = get_surface_color(rt, 177, 217); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 217); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 177, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window);

1 0

Stefan Dösinger : ddraw: Store d3d1 projection matrices in device->legacy_projection.
by Alexandre Julliard Oct. 3, 2016

Oct. 3, 2016

Module: wine Branch: master Commit: ce7fa156a5c9e13bc400a99d53543a7c4bc74eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7fa156a5c9e13bc400a99d5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:28 2016 +0100 ddraw: Store d3d1 projection matrices in device->legacy_projection. The math in transform_vertex is now the same as in wined3d's process_vertices_strided. Calling wined3d_device_process_vertices is easier now, but that will require moving the vertex and index data into buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 13 +++++++------ dlls/ddraw/tests/ddraw1.c | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index fb52ffd..3becf58 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -56,10 +56,11 @@ static void transform_vertex(D3DTLVERTEX *dst, const D3DMATRIX *mat, dst->u3.sz = (x * mat->_13) + (y * mat->_23) + (z * mat->_33) + mat->_43; dst->u4.rhw = (x * mat->_14) + (y * mat->_24) + (z * mat->_34) + mat->_44; - dst->u1.sx = dst->u1.sx / dst->u4.rhw * vp->dvScaleX + vp->dwX + vp->dwWidth / 2; - dst->u2.sy = -dst->u2.sy / dst->u4.rhw * vp->dvScaleY + vp->dwY + vp->dwHeight / 2; - dst->u3.sz /= dst->u4.rhw; dst->u4.rhw = 1.0f / dst->u4.rhw; + + dst->u1.sx = (dst->u1.sx * dst->u4.rhw + 1.0f) * vp->dwWidth * 0.5 + vp->dwX; + dst->u2.sy = (-dst->u2.sy * dst->u4.rhw + 1.0f) * vp->dwHeight * 0.5 + vp->dwY; + dst->u3.sz *= dst->u4.rhw; } HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, @@ -203,7 +204,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, device->view = ci->u2.dwArg[0]; if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION) device->proj = ci->u2.dwArg[0]; - IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, + IDirect3DDevice3_SetTransform(&device->IDirect3DDevice3_iface, ci->u1.dtstTransformStateType, m); } @@ -247,8 +248,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, TRACE("PROCESSVERTICES (%d)\n", count); - /* Get the transform and world matrix */ - /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ + /* Note that the projection set in wined3d has the legacy clip space + * adjustment built in. */ wined3d_device_get_transform(device->wined3d_device, D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat); wined3d_device_get_transform(device->wined3d_device, diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 207ee59..7824a92 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9552,7 +9552,7 @@ static void test_transform_vertices(void) {143.0f, 118.0f, 1.0f, 1.0f}, {133.0f, 128.0f, -1.0f, 1.0f}, {133.0f, 128.0f, 0.0f, 1.0f} }; - todo_wine ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), + ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), "Vertex %u differs. Got %f %f %f %f.\n", i, out[i].x, out[i].y, out[i].z, out[i].w); } @@ -9657,10 +9657,10 @@ static void test_transform_vertices(void) color = get_surface_color(rt, 128, 147); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 132, 147); - todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 217); - todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 181, 217); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 221);

1 0