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

Józef Kucia : d3d9: Validate D3DQUERYTYPE.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: c4e4357eb5058520aec7ccdf40562037f761bafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e4357eb5058520aec7ccdf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:58 2017 +0200 d3d9: Validate D3DQUERYTYPE. 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/d3d9/query.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 4ca2205..335a960 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -185,6 +185,12 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER { HRESULT hr; + if (type > D3DQUERYTYPE_MEMORYPRESSURE) + { + WARN("Invalid query type %#x.\n", type); + return D3DERR_NOTAVAILABLE; + } + query->IDirect3DQuery9_iface.lpVtbl = &d3d9_query_vtbl; query->refcount = 1;

1 0

Józef Kucia : d3d11: Add support for D3D11_QUERY_SO_STATISTICS_STREAM{0, 1, 2, 3} queries.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 856210b62159069ee61434d75c530811513fcb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=856210b62159069ee61434d75… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:10:01 2017 +0200 d3d11: Add support for D3D11_QUERY_SO_STATISTICS_STREAM{0, 1, 2, 3} queries. 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/async.c | 24 ++++++++++------ dlls/d3d11/tests/d3d11.c | 72 +++++++++++++++++++++--------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 78f0126..baa0926 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -398,14 +398,22 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device static const enum wined3d_query_type query_type_map[] = { - /* D3D11_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, - /* D3D11_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D11_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, - /* D3D11_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, - /* D3D11_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, - /* D3D11_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, - /* D3D11_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, - /* D3D11_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, + /* D3D11_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, + /* D3D11_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, + /* D3D11_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, + /* D3D11_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, + /* D3D11_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D11_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, + /* D3D11_QUERY_SO_STATISTICS_STREAM0 */ WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 */ WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM0, + /* D3D11_QUERY_SO_STATISTICS_STREAM1 */ WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 */ WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM1, + /* D3D11_QUERY_SO_STATISTICS_STREAM2 */ WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 */ WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM2, + /* D3D11_QUERY_SO_STATISTICS_STREAM3 */ WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3, + /* D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 */ WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM3, }; if (desc->Query >= ARRAY_SIZE(query_type_map)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 895225d..431db44 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4602,13 +4602,13 @@ static void test_create_query(void) {D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE}, {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, TRUE}, - {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, - {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, - {D3D11_QUERY_SO_STATISTICS_STREAM2, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM2, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, - {D3D11_QUERY_SO_STATISTICS_STREAM3, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS_STREAM3, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, }; @@ -18665,11 +18665,9 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); query_desc.Query = D3D11_QUERY_SO_STATISTICS_STREAM0; query_desc.MiscFlags = 0; - query = NULL; hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); - todo_wine ok(hr == S_OK, "Failed to create query, hr %#x.\n", hr); - if (query) - ID3D11DeviceContext_Begin(context, query); + ok(hr == S_OK, "Failed to create query, hr %#x.\n", hr); + ID3D11DeviceContext_Begin(context, query); set_quad_color(&test_context, &white); for (i = 0; i < ARRAY_SIZE(constant.tess_factors); ++i) @@ -18684,48 +18682,42 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_Draw(context, 4, 0); check_texture_color(test_context.backbuffer, 0xffffffff, 0); - if (query) + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) { - ID3D11DeviceContext_End(context, query); - for (i = 0; i < 500; ++i) - { - if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID3D11DeviceContext_GetData(context, query, &so_statistics, sizeof(so_statistics), 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(so_statistics.NumPrimitivesWritten == 8, "Got unexpected primitives written %u.\n", - (unsigned int)so_statistics.NumPrimitivesWritten); - ok(so_statistics.PrimitivesStorageNeeded == 8, "Got unexpected primitives storage needed %u.\n", - (unsigned int)so_statistics.PrimitivesStorageNeeded); - ID3D11DeviceContext_Begin(context, query); + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &so_statistics, sizeof(so_statistics), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(so_statistics.NumPrimitivesWritten == 8, "Got unexpected primitives written %u.\n", + (unsigned int)so_statistics.NumPrimitivesWritten); + ok(so_statistics.PrimitivesStorageNeeded == 8, "Got unexpected primitives storage needed %u.\n", + (unsigned int)so_statistics.PrimitivesStorageNeeded); + ID3D11DeviceContext_Begin(context, query); constant.tess_factors[0] = 5.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); ID3D11DeviceContext_Draw(context, 4, 0); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); - if (query) + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) { - ID3D11DeviceContext_End(context, query); - for (i = 0; i < 500; ++i) - { - if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - hr = ID3D11DeviceContext_GetData(context, query, &so_statistics, sizeof(so_statistics), 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(so_statistics.NumPrimitivesWritten == 11, "Got unexpected primitives written %u.\n", - (unsigned int)so_statistics.NumPrimitivesWritten); - ok(so_statistics.PrimitivesStorageNeeded == 11, "Got unexpected primitives storage needed %u.\n", - (unsigned int)so_statistics.PrimitivesStorageNeeded); - ID3D11Asynchronous_Release(query); + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &so_statistics, sizeof(so_statistics), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(so_statistics.NumPrimitivesWritten == 11, "Got unexpected primitives written %u.\n", + (unsigned int)so_statistics.NumPrimitivesWritten); + ok(so_statistics.PrimitivesStorageNeeded == 11, "Got unexpected primitives storage needed %u.\n", + (unsigned int)so_statistics.PrimitivesStorageNeeded); + ID3D11Asynchronous_Release(query); ID3D11Buffer_Release(so_buffer); ID3D11GeometryShader_Release(gs);

1 0

Józef Kucia : wined3d: Generate variables for control point phase temporary registers.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: ac1d2f1e2f8c68b4d5c8a1cf7b9e9f9f79840785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1d2f1e2f8c68b4d5c8a1cf7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:09 2017 +0200 wined3d: Generate variables for control point phase temporary registers. 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/glsl_shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7a9007e..1dce957 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7582,6 +7582,8 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_addline(buffer, "void hs_control_point_phase()\n{\n"); if ((phase = hs->phases.control_point)) { + for (i = 0; i < phase->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, phase->start, phase->end))) return 0; shader_addline(buffer, "setup_hs_output(hs_out);\n");

1 0

Henri Verbeet : wined3d: Only warn about 0 stencil ops in gl_stencil_op().
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 059784221822f00dde5810f2c8a1e4b08f862246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059784221822f00dde5810f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:06 2017 +0200 wined3d: Only warn about 0 stencil ops in gl_stencil_op(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index df5a3b1..a59e913 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -827,7 +827,10 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) case WINED3D_STENCIL_OP_DECR: return GL_DECR_WRAP; default: - FIXME("Unrecognized stencil op %#x.\n", op); + if (!op) + WARN("Unrecognized stencil op %#x.\n", op); + else + FIXME("Unrecognized stencil op %#x.\n", op); return GL_KEEP; } }

1 0

Henri Verbeet : d3d10core/tests: Add a test for constant buffer alignment.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: ec248a9e38b90dd921a57980c6ac465d2098d3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec248a9e38b90dd921a57980c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:05 2017 +0200 d3d10core/tests: Add a test for constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f05fa74..364a2ab 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1699,12 +1699,12 @@ static void test_create_texture3d(void) static void test_create_buffer(void) { ID3D11Buffer *d3d11_buffer; + HRESULT expected_hr, hr; D3D10_BUFFER_DESC desc; ID3D10Buffer *buffer; ID3D10Device *device; unsigned int i; ULONG refcount; - HRESULT hr; static const struct test { @@ -1820,6 +1820,18 @@ static void test_create_buffer(void) if (SUCCEEDED(hr)) ID3D10Buffer_Release(buffer); + memset(&desc, 0, sizeof(desc)); + desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + for (i = 0; i <= 32; ++i) + { + desc.ByteWidth = i; + expected_hr = !i || i % 16 ? E_INVALIDARG : S_OK; + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(hr == expected_hr, "Got unexpected hr %#x for constant buffer size %u.\n", hr, i); + if (SUCCEEDED(hr)) + ID3D10Buffer_Release(buffer); + } + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

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

May 25, 2017

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

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

May 25, 2017

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

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

May 25, 2017

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

Stefan Dösinger : msvcp140: Implement _Make_dir.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 799230c78ab102fa0034cb4477ce1be78c456a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=799230c78ab102fa0034cb447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 19:08:19 2017 +0200 msvcp140: Implement _Make_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ee01b42..f13ec56 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3670,7 +3670,7 @@ @ stub _Link @ cdecl _Lock_shared_ptr_spin_lock() @ stub _Lstat -@ stub _Make_dir +@ cdecl _Make_dir(wstr) tr2_sys__Make_dir_wchar @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) _Mtx_current_owns

1 0

Józef Kucia : wined3d: Avoid barrier() in tessellation control shader if possible.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 4597ef6696d75d244e5078a89bac18a1431b936f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4597ef6696d75d244e5078a89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:11 2017 +0200 wined3d: Avoid barrier() in tessellation control shader if possible. Synchronization is only needed when output variables are read. 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8a00aa2..1cfc0e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7610,7 +7610,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_addline(buffer, "void main()\n{\n"); shader_addline(buffer, "hs_control_point_phase();\n"); - if (hs->phases.fork_count || hs->phases.join_count) + if (reg_maps->vocp) shader_addline(buffer, "barrier();\n"); for (i = 0; i < hs->phases.fork_count; ++i) shader_glsl_generate_shader_phase_invocation(buffer, &hs->phases.fork[i], "fork", i); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 144dbff..8827641 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -801,6 +801,10 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w reg_maps->rt_mask |= (1u << reg->idx[0].offset); break; + case WINED3DSPR_OUTCONTROLPOINT: + reg_maps->vocp = 1; + break; + default: TRACE("Not recording register of type %#x and [%#x][%#x].\n", reg->type, reg->idx[0].offset, reg->idx[1].offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1da788e..eb5d316 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1012,7 +1012,8 @@ struct wined3d_shader_reg_maps WORD usescall : 1; WORD usespow : 1; WORD point_size : 1; - WORD padding : 2; + WORD vocp : 1; + WORD padding : 1; DWORD rt_mask; /* Used render targets, 32 max. */

1 0