May 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 2.9.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 7d2ce5cbe7c84dd193e982d4cfe882265867f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2ce5cbe7c84dd193e982d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 713 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 393 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d2ce5cbe7c84dd193e98…

1 0

Tag wine-2.9 : Alexandre Julliard : Release 2.9
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: refs/tags/wine-2.9 Tag: a4a4385d9f47dc2d71060a54439434be4ed2e67e URL: http://source.winehq.org/git/wine.git/?a=tag;h=a4a4385d9f47dc2d71060a544394… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: d7a2ad024af795a4fb8bb069ffcd0a4369a5c950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a2ad024af795a4fb8bb069f… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:24 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b63ba87..29f3e5f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1334,6 +1334,9 @@ static void test_create_texture2d(void) FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 3ab8842894ef70740ad86d8e58b381c68abf268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab8842894ef70740ad86d8e5… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:25 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 29f3e5f..35ba504 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1610,6 +1610,9 @@ static void test_create_texture3d(void) {DXGI_FORMAT_R8G8B8A8_UNORM, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_texture.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 75ce5086ec34e008a01c470abac4fa196997264e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ce5086ec34e008a01c470ab… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:26 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_texture. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 35ba504..f05fa74 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5737,6 +5737,13 @@ static void test_texture(void) 40, 30, 20, 10, 250, 210, 155, 190, }; + static const DWORD r9g9b9e5_data[] = + { + 0x80000100, 0x80020000, 0x84000000, 0x84000100, + 0x78000100, 0x78020000, 0x7c000000, 0x78020100, + 0x70000133, 0x70026600, 0x74cc0000, 0x74cc0133, + 0x6800019a, 0x68033400, 0x6e680000, 0x6e6b359a, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -5780,6 +5787,8 @@ static void test_texture(void) {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, + {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = { 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, @@ -5871,6 +5880,13 @@ static void test_texture(void) 0x01000028, 0x0100001e, 0x01000014, 0x0100000a, 0x010000fa, 0x010000d2, 0x0100009b, 0x010000be, }; + static const DWORD r9g9b9e5_colors[16] = + { + 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffff00ff, + 0xff00007f, 0xff007f00, 0xff7f0000, 0xff007f7f, + 0xff00004c, 0xff004c00, 0xff4c0000, 0xff4c004c, + 0xff000033, 0xff003300, 0xff330000, 0xff333333, + }; static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -5906,6 +5922,7 @@ static void test_texture(void) {&ps_ld, &bc1_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, @@ -5921,6 +5938,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0},

1 0

Sven Hesse : d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: d403e23def92a71821780f08ddb82692d85545fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d403e23def92a71821780f08d… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:27 2017 +0200 d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 91d5927..f60208a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1769,6 +1769,9 @@ static void test_create_texture2d(void) FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, }; if (!(device = create_device(NULL)))

1 0

Sven Hesse : d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 01a83b5bbd24c5161c1f15a49495005a17ba92e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a83b5bbd24c5161c1f15a49… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:28 2017 +0200 d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f60208a..3dcdfdf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2088,6 +2088,9 @@ static void test_create_texture3d(void) {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, }; if (!(device = create_device(NULL)))

1 0

Sven Hesse : d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_texture.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: ef32f7eb204f2181b56ba41923ba788a5b7d5ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef32f7eb204f2181b56ba4192… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:29 2017 +0200 d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_texture. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3dcdfdf..9e3f695 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6107,6 +6107,13 @@ static void test_texture(void) 40, 30, 20, 10, 250, 210, 155, 190, }; + static const DWORD r9g9b9e5_data[] = + { + 0x80000100, 0x80020000, 0x84000000, 0x84000100, + 0x78000100, 0x78020000, 0x7c000000, 0x78020100, + 0x70000133, 0x70026600, 0x74cc0000, 0x74cc0133, + 0x6800019a, 0x68033400, 0x6e680000, 0x6e6b359a, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -6154,6 +6161,8 @@ static void test_texture(void) {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, + {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = { 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, @@ -6252,6 +6261,13 @@ static void test_texture(void) 0x01000028, 0x0100001e, 0x01000014, 0x0100000a, 0x010000fa, 0x010000d2, 0x0100009b, 0x010000be, }; + static const DWORD r9g9b9e5_colors[16] = + { + 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffff00ff, + 0xff00007f, 0xff007f00, 0xff7f0000, 0xff007f7f, + 0xff00004c, 0xff004c00, 0xff4c0000, 0xff4c004c, + 0xff000033, 0xff003300, 0xff330000, 0xff333333, + }; static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -6291,6 +6307,7 @@ static void test_texture(void) {&ps_ld, &bc6h_s_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc7_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, {&ps_ld, &bc7_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc7_colors}, + {&ps_ld, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, @@ -6310,6 +6327,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0},

1 0

Henri Verbeet : wined3d: Fix "sysmem_count" accounting in wined3d_texture_invalidate_location().
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 0726d7e82f9ea8023e97539ba95e33577f8824f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0726d7e82f9ea8023e97539ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:02 2017 +0200 wined3d: Fix "sysmem_count" accounting in wined3d_texture_invalidate_location(). Only increase it if the sub-resource wasn't already exclusively in system memory. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 61be9a2..476295c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -155,6 +155,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) { struct wined3d_texture_sub_resource *sub_resource; + DWORD previous_locations; TRACE("texture %p, sub_resource_idx %u, location %s.\n", texture, sub_resource_idx, wined3d_debug_location(location)); @@ -163,8 +164,9 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, wined3d_texture_set_dirty(texture); sub_resource = &texture->sub_resources[sub_resource_idx]; + previous_locations = sub_resource->locations; sub_resource->locations &= ~location; - if (sub_resource->locations == WINED3D_LOCATION_SYSMEM) + if (previous_locations != WINED3D_LOCATION_SYSMEM && sub_resource->locations == WINED3D_LOCATION_SYSMEM) ++texture->sysmem_count; TRACE("New locations flags are %s.\n", wined3d_debug_location(sub_resource->locations));

1 0

Henri Verbeet : wined3d: Validate constant buffer alignment.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: cb77e188d118ae52a24c22d485cf05aa0740c576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb77e188d118ae52a24c22d48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:03 2017 +0200 wined3d: Validate constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3cf153b..ab2fea3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1380,8 +1380,14 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!size) { - WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; + WARN("Size 0 requested, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER && size & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) + { + WARN("Size %#x is not suitably aligned for constant buffers.\n", size); + return E_INVALIDARG; } if (data && !data->data) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 321f4d5..1da788e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2894,6 +2894,7 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 +#define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16 struct gl_texture {

1 0