January 2019 - Wine-devel - list.winehq.org

[PATCH 1/4] d3d8: Clamp vertex buffer upload range to buffer size.
by Józef Kucia 16 Jan '19

16 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/device.c | 8 ++++++-- dlls/d3d8/tests/visual.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b2a6e48da090..9e82b1e72763 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2271,8 +2271,10 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_resource *dst_resource; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; + struct wined3d_resource_desc desc; HRESULT hr; map = device->sysmem_vb; @@ -2284,10 +2286,12 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); + dst_resource = wined3d_buffer_get_resource(dst_buffer); + wined3d_resource_get_desc(dst_resource, &desc); box.left = offset + start_vertex * stride; - box.right = box.left + vertex_count * stride; + box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, - wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + dst_resource, 0, box.left, 0, 0, wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) ERR("Failed to update buffer.\n"); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 43b286b0373b..cc5992281f34 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10687,7 +10687,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_BeginScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 5, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH] rpcrt4/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 42 +++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2187a08394..e4a4c6a727 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -431,7 +431,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -465,7 +468,10 @@ static void test_pointer_marshal(const unsigned char *formattypes, if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else + { ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + HeapFree(GetProcessHeap(), 0, mem_orig); + } ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); @@ -806,6 +812,7 @@ static void test_nontrivial_pointer_types(void) /* Server */ my_alloc_called = 0; + my_free_called = 0; StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -813,14 +820,19 @@ static void test_nontrivial_pointer_types(void) ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; + my_free_called = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); my_alloc_called = 0; mem = mem_orig; @@ -917,7 +929,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* If we're a server we still use the supplied memory */ StubMsg.Buffer = StubMsg.BufferStart; @@ -928,7 +943,10 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); /* ...unless we pass a NULL ptr, then the buffer is used. Passing a NULL ptr while we're a client && !must_alloc @@ -946,6 +964,8 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); } /*** now must_alloc is true ***/ @@ -961,7 +981,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -970,8 +994,12 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(mem != mem_orig, "mem not changed %p %p\n", mem, mem_orig); ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = mem_orig; StubMsg.Buffer = StubMsg.BufferStart; @@ -984,7 +1012,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -996,7 +1028,11 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(!cmp(mem, memsrc, srcsize), "incorrectly unmarshaled\n"); ok(my_alloc_called == num_additional_allocs + 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; + my_free_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + NdrSimpleStructFree(&StubMsg, mem, formattypes ); + ok(my_free_called == num_additional_allocs, "free called %d\n", my_free_called); + my_free(mem); HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); @@ -1506,6 +1542,8 @@ static void test_iface_ptr(void) NdrInterfacePointerFree(&StubMsg, (unsigned char *)proxy, fmtstr_ip); ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); + CoUninitialize(); } @@ -1867,6 +1905,8 @@ static void test_ndr_allocate(void) else win_skip("v1 mem list format\n"); } /* NdrFree isn't exported so we can't test free'ing */ + my_free(p1); + my_free(p2); } static void test_conformant_array(void) -- 2.17.1

1 0

[PATCH] crypt32/tests: Fix a memory leak (Valgrind).
by Gijs Vermeulen 15 Jan '19

15 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/store.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 0adfeb8529..d862902c88 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2834,6 +2834,8 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + CertFreeCertificateContext(cert3); + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed\n"); @@ -2847,6 +2849,7 @@ static void testEmptyStore(void) ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); CertCloseStore(store, 0); + CertFreeCertificateContext(cert3); res = CertCloseStore(cert->hCertStore, CERT_CLOSE_STORE_CHECK_FLAG); ok(!res && GetLastError() == E_UNEXPECTED, "CertCloseStore returned: %x(%x)\n", res, GetLastError()); -- 2.20.1

1 0

[PATCH] windowscodecs: Fix the buffer size check in TIFF decoder's CopyPixels implementation.
by Dmitry Timoshkov 15 Jan '19

15 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index c15e4985e6..7651ea154a 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af5594a7..3d53b2439a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (cbStride < bytesperrow) return E_INVALIDARG; - if ((cbStride * prc->Height) > cbBufferSize) + if ((cbStride * (prc->Height-1)) + bytesperrow > cbBufferSize) return E_INVALIDARG; min_tile_x = prc->X / This->decode_info.tile_width; -- 2.20.1

2 1

[website] Revise the 'Get Involved' web page.
by Jeremy White 15 Jan '19

15 Jan '19

This attempts to remove some information that is provided at other points in the web site, and to adjust the language to attempt to improve the overall flow of the page. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> --- templates/en/getinvolved.template | 92 +++++++++++---------------------------- templates/en/home.template | 2 +- 2 files changed, 26 insertions(+), 68 deletions(-) diff --git a/templates/en/getinvolved.template b/templates/en/getinvolved.template index 8ad5b049..23028db4 100644 --- a/templates/en/getinvolved.template +++ b/templates/en/getinvolved.template @@ -1,14 +1,14 @@ - + -<h1 class="title">Development Links</h1> +<h1 class="title">Get Involved</h1> -<p>Welcome to Wine development. On this page you will find links to our -various resources available for our developers.</p> +<p>The Wine Project is largely a volunteer project and we welcome +and value volunteers of all kinds. This page has links to pages describing how to get more involved with Wine.</p> <div class="black inverse bold cornerround padding-sm"> <div class="row"> - <div class="col-xs-3 col-md-2">Option</div> - <div class="col-xs-9 col-md-10">About this Option</div> + <div class="col-xs-3 col-md-2">Link</div> + <div class="col-xs-9 col-md-10">Description</div> </div> </div> @@ -17,108 +17,66 @@ various resources available for our developers.</p> <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> </div> <div class="col-xs-9 col-md-10"> - Information for 1st time contributors. + A list of ways to contribute to Wine, with further links. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> + <a href="https://wiki.winehq.org/Developers">Developer Documentation</a> </div> <div class="col-xs-9 col-md-10"> - The <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> pages will have more current - information than this page. It should be the first place for new developers to look. + The developer pages provide a great deal of information about how + to work with the Wine source code and how to contribute code to Wine. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://www.codeweavers.com/about/jobs">Internships</a> + <a href="{$root}/forums">Forums and Mailing Lists</a> </div> <div class="col-xs-9 col-md-10"> - CodeWeavers fills 1-2 Wine Development Internship slots every quarter for students and recent graduates. - Applications are accepted on an ongoing basis, and candidates from both the United States and overseas - are welcome. + Most user support happens on our forums, and most technical + Wine discussion takes place on the wine-devel mailing list. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Developer's Guide</a> + <a href="{$root}/irc">IRC</a> </div> <div class="col-xs-9 col-md-10"> - Online resource for development with Wine. + Our IRC chat rooms can be a good place for more informal conversations. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="{$root}/forums">Mailing Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - Most of our developers communicate over our various mailing lists. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Git_Wine_Tutorial">Git</a> - </div> - <div class="col-xs-9 col-md-10"> - We use the source management tool Git. More information on how to use it can be found on this page. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Submitting_Patches">Sending Patches</a> - </div> - <div class="col-xs-9 col-md-10"> - Guidelines on how to format and send your patches. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Category:ToDo">To Do Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - What needs to be done. A good first place to look for projects to be completed. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Winelib">Winelib</a> - </div> - <div class="col-xs-9 col-md-10"> - Documentation on development with Winelib, our application porting tools. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Status">Status</a> + <a href="https://wiki.winehq.org/WineConf">WineConf</a> </div> <div class="col-xs-9 col-md-10"> - Status of the Wine project.<br> + We hold a conference annually. Everyone is welcome, and coming to + our conference is a great way to get involved. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Licensing">Wine License</a> + <a href="https://wiki.winehq.org/Summer_Of_Code">Summer of Code</a> </div> <div class="col-xs-9 col-md-10"> - Wine uses the GNU Lesser General Public License 2.1 + Wine is a regular participant in the Google Summer of Code program. + Students can be paid to help improve Wine! </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/WineConf">WineConf</a> + <a href="https://www.codeweavers.com/about/jobs">Jobs at CodeWeavers</a> </div> <div class="col-xs-9 col-md-10"> - We hold a conference annually. Information on where and when can be found here. + CodeWeavers employs a range of staff to develop Wine. If you think + working on Free Software full time would be rewarding, you might consider + applying for a job with CodeWeavers. </div> </div> diff --git a/templates/en/home.template b/templates/en/home.template index 04115692..cc8d5de9 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -137,7 +137,7 @@ <i class="fa-inverse fas fa-users" data-fa-transform="shrink-6"></i> </span> <span class="title">Get Involved</span> - <span class="subtitle">Become a Wine advocate.</span> + <span class="subtitle">Improve and develop Wine.</span> </a> <div class="clear"></div> -- 2.11.0

1 0

[PATCH] taskschd/tests: Fix some memory leaks (Valgrind).
by Sven Baars 15 Jan '19

15 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/taskschd/tests/scheduler.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5fc3aab595..60546c30b2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -153,11 +153,13 @@ static void test_GetFolder(void) hr = ITaskService_GetFolder(service, slash, &folder); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + if (hr == S_OK) ITaskFolder_Release(folder); hr = ITaskService_GetFolder(service, dot, &folder); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_INVALID_NAME, got %#x\n", hr); + if (hr == S_OK) ITaskFolder_Release(folder); hr = ITaskService_GetFolder(service, bslash, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -544,6 +546,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -571,6 +574,7 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + IUnknown_Release(unknown); hr = IEnumVARIANT_Skip(enumvar, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); @@ -605,6 +609,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); IDispatch_Release(V_DISPATCH(&var[0])); memset(var, 0, sizeof(var)); @@ -650,6 +655,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -1049,7 +1055,10 @@ static void test_settings_v1(ITaskDefinition *taskdef, struct settings *test, st if (!test->execution_time_limit[0]) ok(bstr == NULL, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); else + { ok(!lstrcmpW(bstr, test->execution_time_limit), "expected %s, got %s\n", wine_dbgstr_w(test->execution_time_limit), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } hr = ITaskSettings_get_Enabled(set, &vbool); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.17.1

2 5

[PATCH vkd3d 5/6] vkd3d-shader: Use vkd3d_dxbc_compiler_emit_load_src() in more places.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 40cb2e3929f0..a15bc32116bb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5014,8 +5014,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp continue; for (j = 0; j < src_count; ++j) - src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_reg(compiler, - &src[j].reg, src[j].swizzle, write_mask); + src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[j], write_mask); for (j = src_count - 2; j < src_count; ++j) { -- 2.19.2

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Use result type for bitfield instructions source parameters.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes SPIR-V validation errors: Expected Base Type to be equal to Result Type: BitFieldSExtract Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a15bc32116bb..82a9f628ba88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4988,6 +4988,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + enum vkd3d_component_type component_type; unsigned int i, j, k, src_count; DWORD write_mask; SpvOp op; @@ -4995,7 +4996,8 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp src_count = instruction->src_count; assert(2 <= src_count && src_count <= ARRAY_SIZE(src_ids)); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + component_type = vkd3d_component_type_from_data_type(dst->reg.data_type); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); mask_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0x1f); switch (instruction->handler_idx) @@ -5014,20 +5016,22 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp continue; for (j = 0; j < src_count; ++j) - src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[j], write_mask); + { + src_ids[src_count - j - 1] = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, + &src[j], write_mask, component_type); + } + /* In SPIR-V, the last two operands are Offset and Count. */ for (j = src_count - 2; j < src_count; ++j) { - uint32_t int_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - src_ids[j] = vkd3d_spirv_build_op_and(builder, int_type_id, src_ids[j], mask_id); + src_ids[j] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[j], mask_id); } constituents[k++] = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, src_count); } - vkd3d_dxbc_compiler_emit_store_dst_components(compiler, - dst, vkd3d_component_type_from_data_type(dst->reg.data_type), constituents); + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, constituents); } static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compiler, -- 2.19.2

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Use result type for atomic instructions source parameters.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes SPIR-V validation errors: AtomicIAdd: expected Value to be of type Result Type Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa9434080dda..40cb2e3929f0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2799,6 +2799,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_src_modifier(compiler, &src->reg, write_mask, src->modifiers, val_id); } +static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_src_param *src, DWORD write_mask, enum vkd3d_component_type component_type) +{ + struct vkd3d_shader_src_param src_param = *src; + + src_param.reg.data_type = vkd3d_data_type_from_component_type(component_type); + return vkd3d_dxbc_compiler_emit_load_src(compiler, &src_param, write_mask); +} + static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) @@ -6244,7 +6253,6 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - struct vkd3d_shader_src_param texel_param = src[1]; uint32_t coordinate_id, texel_id; struct vkd3d_shader_image image; DWORD coordinate_mask; @@ -6254,9 +6262,7 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - /* XXX: Fix the data type. */ - texel_param.reg.data_type = vkd3d_data_type_from_component_type(image.sampled_type); - texel_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &texel_param, dst->write_mask); + texel_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], dst->write_mask, image.sampled_type); vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, texel_id, SpvImageOperandsMaskNone, NULL, 0); @@ -6365,6 +6371,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil const struct vkd3d_shader_dst_param *resource; uint32_t coordinate_id, sample_id, pointer_id; struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; struct vkd3d_shader_image image; unsigned int structure_stride; DWORD coordinate_mask; @@ -6417,12 +6424,14 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (resource->reg.type == VKD3DSPR_GROUPSHAREDMEM) { + component_type = VKD3D_TYPE_UINT; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, reg_info.id, &coordinate_id, 1); } else { + component_type = image.sampled_type; type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); @@ -6430,7 +6439,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil ptr_type_id, image.id, coordinate_id, sample_id); } - val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + val_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], VKD3DSP_WRITEMASK_0, component_type); operands[i++] = pointer_id; operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, scope); @@ -6438,7 +6447,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (instruction->src_count >= 3) { operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone); - operands[i++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[2], VKD3DSP_WRITEMASK_0); + operands[i++] = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[2], VKD3DSP_WRITEMASK_0, component_type); } operands[i++] = val_id; result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, -- 2.19.2

2 1

[PATCH vkd3d 3/6] tests: Add test for SV_VertexID with indirect draws.
by Józef Kucia 15 Jan '19

15 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 163 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 111 insertions(+), 52 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 32220a9fc96e..5be8e0d9b967 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -763,6 +763,42 @@ static ID3D12PipelineState *create_compute_pipeline_state_(unsigned int line, ID return pipeline_state; } +#define create_command_signature(a, b) create_command_signature_(__LINE__, a, b) +static ID3D12CommandSignature *create_command_signature_(unsigned int line, + ID3D12Device *device, D3D12_INDIRECT_ARGUMENT_TYPE argument_type) +{ + D3D12_COMMAND_SIGNATURE_DESC signature_desc; + D3D12_INDIRECT_ARGUMENT_DESC argument_desc; + ID3D12CommandSignature *command_signature; + HRESULT hr; + + argument_desc.Type = argument_type; + + switch (argument_type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + signature_desc.ByteStride = sizeof(D3D12_DRAW_INDEXED_ARGUMENTS); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); + break; + default: + return NULL; + } + + signature_desc.NumArgumentDescs = 1; + signature_desc.pArgumentDescs = &argument_desc; + signature_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok_(line)(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + + return command_signature; +} + #define init_compute_test_context(context) init_compute_test_context_(__LINE__, context) static bool init_compute_test_context_(unsigned int line, struct test_context *context) { @@ -2559,9 +2595,7 @@ static void test_create_fence(void) static void test_private_data(void) { - D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; @@ -2638,14 +2672,7 @@ static void test_private_data(void) else if (IsEqualGUID(tests[i], &IID_ID3D12CommandSignature)) { vkd3d_test_set_context("command signature"); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - command_signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - command_signature_desc.NumArgumentDescs = 1; - command_signature_desc.pArgumentDescs = &argument_desc; - command_signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(device, &command_signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&unknown); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + unknown = (IUnknown *)create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); } else if (IsEqualGUID(tests[i], &IID_ID3D12DescriptorHeap)) { @@ -18602,8 +18629,6 @@ static void test_resolve_query_data_in_reordered_command_list(void) static void test_execute_indirect(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_COMMAND_SIGNATURE_DESC signature_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; ID3D12Resource *argument_buffer, *uav; @@ -18742,15 +18767,7 @@ static void test_execute_indirect(void) argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - - signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -18769,11 +18786,7 @@ static void test_execute_indirect(void) reset_command_list(command_list, context.allocator); ID3D12CommandSignature_Release(command_signature); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; - signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH); uav = create_default_buffer(context.device, 2 * 3 * 4 * sizeof(UINT), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -18814,11 +18827,7 @@ static void test_execute_indirect(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12CommandSignature_Release(command_signature); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; - signature_desc.ByteStride = sizeof(*argument_data.indexed_draws); - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); ID3D12PipelineState_Release(context.pipeline_state); input_layout.pInputElementDescs = layout_desc; @@ -18874,8 +18883,6 @@ static void test_execute_indirect(void) static void test_dispatch_zero_thread_groups(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_COMMAND_SIGNATURE_DESC signature_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; @@ -18926,15 +18933,7 @@ static void test_dispatch_zero_thread_groups(void) argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; - - signature_desc.ByteStride = sizeof(D3D12_DISPATCH_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH); uav = create_default_buffer(context.device, 2 * 256, /* minTexelBufferOffsetAlignment */ D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -19000,9 +18999,7 @@ static void test_dispatch_zero_thread_groups(void) static void test_instance_id(void) { - D3D12_COMMAND_SIGNATURE_DESC signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; - D3D12_INDIRECT_ARGUMENT_DESC argument_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; @@ -19220,14 +19217,7 @@ static void test_instance_id(void) vbv[2].StrideInBytes = sizeof(*stream2); vbv[2].SizeInBytes = sizeof(stream2); - argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; - signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); - signature_desc.NumArgumentDescs = 1; - signature_desc.pArgumentDescs = &argument_desc; - signature_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandSignature(context.device, &signature_desc, - NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); - ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); @@ -19345,12 +19335,34 @@ static void test_vertex_id(void) 5, 6, 7, + + 0xa, + 0xb, + 0xc, + 0xd, + + 0xe, + 0xf, }; static const unsigned int indices[] = { 6, 7, 8, 0, 1, 2, + + 0, 1, 2, 3, + + 8, 9, + }; + static const D3D12_DRAW_ARGUMENTS argument_data[] = + { + {4, 1, 12, 1}, + {2, 3, 16, 0}, + }; + static const D3D12_DRAW_INDEXED_ARGUMENTS indexed_argument_data[] = + { + {4, 1, 6, 12, 1}, + {2, 3, 10, 8, 0}, }; struct uvec4 expected_values[] = { @@ -19375,12 +19387,39 @@ static void test_vertex_id(void) {5, 0, 0}, {6, 0, 1}, {7, 0, 2}, + + {0xa, 0, 0}, + {0xb, 0, 1}, + {0xc, 0, 2}, + {0xd, 0, 3}, + + {0xe, 0, 0}, + {0xf, 0, 1}, + {0xe, 1, 0}, + {0xf, 1, 1}, + {0xe, 2, 0}, + {0xf, 2, 1}, + + {0xa, 0, 0}, + {0xb, 0, 1}, + {0xc, 0, 2}, + {0xd, 0, 3}, + + {0xe, 0, 8}, + {0xf, 0, 9}, + {0xe, 1, 8}, + {0xf, 1, 9}, + {0xe, 2, 8}, + {0xf, 2, 9}, }; BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + ID3D12Resource *args_buffer, *indexed_args_buffer; + ID3D12CommandSignature *indexed_command_signature; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12Resource *counter_buffer, *so_buffer; + ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; @@ -19438,6 +19477,12 @@ static void test_vertex_id(void) ibv.SizeInBytes = sizeof(indices); ibv.Format = DXGI_FORMAT_R32_UINT; + args_buffer = create_upload_buffer(device, sizeof(argument_data), &argument_data); + indexed_args_buffer = create_upload_buffer(device, sizeof(indexed_argument_data), &indexed_argument_data); + + command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); + indexed_command_signature = create_command_signature(device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); + count = 0; upload_buffer = create_upload_buffer(device, sizeof(count), &count); @@ -19471,6 +19516,16 @@ static void test_vertex_id(void) ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0); ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + command_signature, 1, args_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + command_signature, 1, args_buffer, sizeof(*argument_data), NULL, 0); + + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + indexed_command_signature, 1, indexed_args_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, + indexed_command_signature, 1, indexed_args_buffer, sizeof(*indexed_argument_data), NULL, 0); + transition_resource_state(command_list, counter_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); transition_resource_state(command_list, so_buffer, @@ -19512,8 +19567,12 @@ static void test_vertex_id(void) expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); } + ID3D12CommandSignature_Release(command_signature); + ID3D12CommandSignature_Release(indexed_command_signature); + ID3D12Resource_Release(args_buffer); ID3D12Resource_Release(counter_buffer); ID3D12Resource_Release(ib); + ID3D12Resource_Release(indexed_args_buffer); ID3D12Resource_Release(so_buffer); ID3D12Resource_Release(upload_buffer); ID3D12Resource_Release(vb); -- 2.19.2

2 1