wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

André Hentschel : wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: d50b3b3e5bb4fe5f40c36dcb522287698c171f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b3e5bb4fe5f40c36dcb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:32 2017 +0200 wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index fd89be7..7954ede 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -38,7 +38,7 @@ @ stub WSDUriEncode @ stdcall WSDXMLAddChild(ptr ptr) @ stdcall WSDXMLAddSibling(ptr ptr) -@ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) +@ stdcall WSDXMLBuildAnyForSingleElement(ptr wstr ptr) @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace

1 0

André Hentschel : cryptnet: Fix CryptGetObjectUrl spec file entry.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 9a4739810c18c9ba63fb44396e56933ac94a5c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4739810c18c9ba63fb44396… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:30 2017 +0200 cryptnet: Fix CryptGetObjectUrl spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet.spec b/dlls/cryptnet/cryptnet.spec index 6fca711..92d5c40 100644 --- a/dlls/cryptnet/cryptnet.spec +++ b/dlls/cryptnet/cryptnet.spec @@ -4,7 +4,7 @@ @ stub LdapProvOpenStore @ stub CryptCancelAsyncRetrieval @ stub CryptFlushTimeValidObject -@ stdcall CryptGetObjectUrl(ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall CryptGetObjectUrl(str ptr long ptr ptr ptr ptr ptr) @ stub CryptGetTimeValidObject @ stub CryptInstallCancelRetrieval @ stdcall CryptRetrieveObjectByUrlA(str str long long ptr ptr ptr ptr ptr)

1 0

Stefan Dösinger : msvcp140: Implement _Make_dir.
by Alexandre Julliard 25 May '17

25 May '17

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 : d3d11: Add support for D3D11_QUERY_SO_STATISTICS_STREAM{0, 1, 2, 3} queries.
by Alexandre Julliard 25 May '17

25 May '17

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: Try harder to keep the current context.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 1eb642aaf23bfa7f13af4e9d9207e87e39b8c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb642aaf23bfa7f13af4e9d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:10:00 2017 +0200 wined3d: Try harder to keep the current context. 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e0c51f9..49b9186 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3956,6 +3956,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context; + BOOL swapchain_texture; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -3964,6 +3965,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, if (current_context && current_context->destroyed) current_context = NULL; + swapchain_texture = texture && texture->swapchain; if (!texture) { if (current_context @@ -3989,7 +3991,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { context = current_context; } - else if (texture->swapchain) + else if (swapchain_texture) { TRACE("Rendering onscreen.\n"); @@ -4010,7 +4012,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, context_enter(context); context_update_window(context); context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) return context; + if (!context->valid) + return context; if (context != current_context) {

1 0

Józef Kucia : wined3d: Implement SO statistics queries.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: dfa3be5c9da87bf0a58f0ebe7af5647eeff2b15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa3be5c9da87bf0a58f0ebe7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:59 2017 +0200 wined3d: Implement SO statistics 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/wined3d/context.c | 64 ++++++++++++- dlls/wined3d/directx.c | 16 ++++ dlls/wined3d/query.c | 200 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 3 +- dlls/wined3d/wined3d_private.h | 31 +++++++ include/wine/wined3d.h | 49 ++++++---- 6 files changed, 343 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfa3be5c9da87bf0a58f0…

1 0

Józef Kucia : d3d9: Validate D3DQUERYTYPE.
by Alexandre Julliard 25 May '17

25 May '17

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/tests: Do not recreate SO buffer in test_quad_tessellation().
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 57d813c6e4ead3eeac8f5521bfc0cbe14c3d410c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d813c6e4ead3eeac8f5521b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:57 2017 +0200 d3d11/tests: Do not recreate SO buffer in test_quad_tessellation(). 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/tests/d3d11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7f34fbd..895225d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18647,8 +18647,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11HullShader_Release(hs); hr = ID3D11Device_CreateHullShader(device, hs_quad_cw_code, sizeof(hs_quad_cw_code), NULL, &hs); @@ -18661,8 +18660,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); query_desc.Query = D3D11_QUERY_SO_STATISTICS_STREAM0;

1 0

Józef Kucia : wined3d: Implement hull shader vocp register.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: aff0cbb9c707f05d6c67b0c42084b4b1a43c3f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0cbb9c707f05d6c67b0c42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:12 2017 +0200 wined3d: Implement hull shader vocp register. 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 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cfc0e6..73ab7a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3066,6 +3066,31 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "gl_TessCoord"); break; + case WINED3DSPR_OUTCONTROLPOINT: + if (reg->idx[0].rel_addr) + { + if (reg->idx[1].rel_addr) + sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", + rel_param0.param_str, reg->idx[0].offset, + rel_param1.param_str, reg->idx[1].offset); + else + sprintf(register_name, "shader_out[%s + %u].reg[%u]", + rel_param0.param_str, reg->idx[0].offset, + reg->idx[1].offset); + } + else if (reg->idx[1].rel_addr) + { + sprintf(register_name, "shader_out[%u].reg[%s + %u]", + reg->idx[0].offset, rel_param1.param_str, + reg->idx[1].offset); + } + else + { + sprintf(register_name, "shader_out[%u].reg[%u]", + reg->idx[0].offset, reg->idx[1].offset); + } + break; + case WINED3DSPR_PATCHCONST: if (version->type == WINED3D_SHADER_TYPE_HULL) sprintf(register_name, "hs_out[%u]", reg->idx[0].offset);

1 0

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

25 May '17

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

← Newer
1
...
8
9
10
11
12
13
14
...
64
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 May 2017