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

[PATCH v3 1/8] quartz/filtergraph: Remove type tracing from IGraphBuilder::AddSourceFilter().
by Zebediah Figura 06 Aug '19

06 Aug '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Sorry for the noise... dlls/quartz/filtergraph.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a441294b7d4..d151cdfde8e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1754,9 +1754,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); HRESULT hr; IBaseFilter* preader; - IFileSourceFilter* pfile = NULL; - AM_MEDIA_TYPE mt; - WCHAR* filename; TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); @@ -1774,39 +1771,10 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR return hr; } - hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); - if (FAILED(hr)) { - WARN("Unable to get IFileSourceInterface (%x)\n", hr); - goto error; - } - - /* The file has been already loaded */ - hr = IFileSourceFilter_GetCurFile(pfile, &filename, &mt); - if (FAILED(hr)) { - WARN("GetCurFile (%x)\n", hr); - goto error; - } - - TRACE("File %s\n", debugstr_w(filename)); - TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); - TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); - - CoTaskMemFree(filename); - FreeMediaType(&mt); - if (ppFilter) *ppFilter = preader; - IFileSourceFilter_Release(pfile); return S_OK; - -error: - if (pfile) - IFileSourceFilter_Release(pfile); - IFilterGraph2_RemoveFilter(iface, preader); - IBaseFilter_Release(preader); - - return hr; } static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR hFile) -- 2.20.1

2 8

[PATCH v2 1/8] quartz/filtergraph: Remove type tracing from IGraphBuilder::AddSourceFilter().
by Zebediah Figura 06 Aug '19

06 Aug '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a441294b7d4..d151cdfde8e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1754,9 +1754,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); HRESULT hr; IBaseFilter* preader; - IFileSourceFilter* pfile = NULL; - AM_MEDIA_TYPE mt; - WCHAR* filename; TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); @@ -1774,39 +1771,10 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR return hr; } - hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); - if (FAILED(hr)) { - WARN("Unable to get IFileSourceInterface (%x)\n", hr); - goto error; - } - - /* The file has been already loaded */ - hr = IFileSourceFilter_GetCurFile(pfile, &filename, &mt); - if (FAILED(hr)) { - WARN("GetCurFile (%x)\n", hr); - goto error; - } - - TRACE("File %s\n", debugstr_w(filename)); - TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); - TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); - - CoTaskMemFree(filename); - FreeMediaType(&mt); - if (ppFilter) *ppFilter = preader; - IFileSourceFilter_Release(pfile); return S_OK; - -error: - if (pfile) - IFileSourceFilter_Release(pfile); - IFilterGraph2_RemoveFilter(iface, preader); - IBaseFilter_Release(preader); - - return hr; } static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR hFile) -- 2.20.1

2 11

[PATCH 2/2] server: Report only one debug even per process at the time.
by Jacek Caban 06 Aug '19

06 Aug '19

2 1

[PATCH 1/2] kernel32/tests: Improve timeout hanling in debugger tests.
by Jacek Caban 06 Aug '19

06 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

2 1

[PATCH 1/2] comctl32/listbox: Set the selection if it's currently invalid in HandleTimer
by Gabriel Ivăncescu 06 Aug '19

06 Aug '19

Don't skip MoveCaret if it would actually change the selection when it is invalid. This can happen, for example, in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox, when the listbox has nothing selected. In this case, the item with the index zero would not be selected the first time the mouse moves over it, since the focus_item would be zero, despite the fact the item is not selected. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ab4c481..b2d3a3e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2332,7 +2332,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.21.0

2 2

[PATCH 1/5] ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost.
by Paul Gofman 06 Aug '19

06 Aug '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/surface.c | 47 +++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++++++++---------- 2 files changed, 69 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cf3b31f885..411267c3da 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -757,38 +757,47 @@ static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *iface, - DDSCAPS2 *Caps, IDirectDrawSurface7 **Surface) + DDSCAPS2 *caps, IDirectDrawSurface7 **surface) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *head_surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *surf; DDSCAPS2 our_caps; int i; - TRACE("iface %p, caps %p, attachment %p.\n", iface, Caps, Surface); + TRACE("iface %p, caps %p, attachment %p.\n", iface, caps, surface); + + if (IDirectDrawSurface7_IsLost(&head_surface->IDirectDrawSurface7_iface) != DD_OK) + { + WARN("Surface %p is lost.\n", head_surface); + + *surface = NULL; + return DDERR_SURFACELOST; + } wined3d_mutex_lock(); - if(This->version < 7) + if(head_surface->version < 7) { /* Earlier dx apps put garbage into these members, clear them */ - our_caps.dwCaps = Caps->dwCaps; + our_caps.dwCaps = caps->dwCaps; our_caps.dwCaps2 = 0; our_caps.dwCaps3 = 0; our_caps.u1.dwCaps4 = 0; } else { - our_caps = *Caps; + our_caps = *caps; } - TRACE("(%p): Looking for caps: %x,%x,%x,%x\n", This, our_caps.dwCaps, our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ + TRACE("head_surface %p, looking for caps %#x, %#x, %#x, %#x.\n", head_surface, our_caps.dwCaps, + our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { - surf = This->complex_array[i]; + surf = head_surface->complex_array[i]; if(!surf) break; - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -803,9 +812,9 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa * Not sure how to test this. */ - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; @@ -813,11 +822,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa } /* Next, look at the attachment chain */ - surf = This; + surf = head_surface; while( (surf = surf->next_attached) ) { - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -826,19 +835,19 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; } } - TRACE("(%p) Didn't find a valid surface\n", This); + TRACE("head_surface %p, didn't find a valid surface.\n", head_surface); wined3d_mutex_unlock(); - *Surface = NULL; + *surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 49aab667e5..171e6a5363 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -997,6 +997,7 @@ static void test_coop_level_d3d_state(void) IDirectDraw7 *ddraw; IDirect3D7 *d3d; D3DCOLOR color; + DDSCAPS2 caps; DWORD value; HWND window; HRESULT hr; @@ -1010,44 +1011,63 @@ static void test_coop_level_d3d_state(void) } hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D7_Release(d3d); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + IDirectDraw7_Release(ddraw); hr = IDirect3DDevice7_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); @@ -9012,11 +9032,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9186,6 +9207,12 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); -- 2.21.0

3 14

[PATCH 05/11] gduplus: Build with ucrtbase.
by Jacek Caban 06 Aug '19

06 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdiplus/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] d3d9: Remove duplicate condition in d3d9_device_SetStreamSource().
by Andrey Gusev 06 Aug '19

06 Aug '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dc3363bab8..61d72e5135 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3564,12 +3564,13 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); + if (!buffer_impl) + { wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, &offset, &stride); - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else -- 2.21.0

3 2

[PATCH vkd3d 6/6] vkd3d: Remove unused d3d12_root_signature_init_descriptor_pool_size().
by Józef Kucia 06 Aug '19

06 Aug '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 80 -------------------------------------- libs/vkd3d/vkd3d_private.h | 3 -- 3 files changed, 1 insertion(+), 84 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ac7e658d5794..ae88910a992c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2821,7 +2821,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis struct d3d12_desc *base_descriptor; unsigned int i; - if (!rs || !rs->pool_size_count || !rs->vk_set_layout) + if (!rs || !rs->vk_set_layout) return; if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8ddbd4ff1b23..12a711b4ab33 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -64,8 +64,6 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->vk_pipeline_layout) VK_CALL(vkDestroyPipelineLayout(device->vk_device, root_signature->vk_pipeline_layout, NULL)); - if (root_signature->pool_sizes) - vkd3d_free(root_signature->pool_sizes); if (root_signature->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, root_signature->vk_set_layout, NULL)); if (root_signature->vk_push_set_layout) @@ -430,80 +428,6 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i return S_OK; } -static HRESULT d3d12_root_signature_init_descriptor_pool_size(struct d3d12_root_signature *root_signature, - const struct d3d12_root_signature_info *info) -{ - unsigned int i; - - root_signature->pool_size_count = 0; - if (info->cbv_count) - ++root_signature->pool_size_count; - if (info->buffer_srv_count || info->srv_count) - ++root_signature->pool_size_count; - if (info->srv_count) - ++root_signature->pool_size_count; - if (info->buffer_uav_count || info->uav_count) - ++root_signature->pool_size_count; - if (info->uav_count) - ++root_signature->pool_size_count; - if (info->sampler_count) - ++root_signature->pool_size_count; - - if (root_signature->pool_size_count) - { - if (!(root_signature->pool_sizes = vkd3d_calloc(root_signature->pool_size_count, - sizeof(*root_signature->pool_sizes)))) - { - return E_OUTOFMEMORY; - } - - i = 0; - if (info->cbv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->cbv_count; - } - /* Each D3D12_DESCRIPTOR_RANGE_TYPE_SRV descriptor can be either a - * buffer or a texture view. Allocate one buffer view and one image - * view Vulkan descriptor for each. */ - if (info->buffer_srv_count || info->srv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->buffer_srv_count + info->srv_count; - } - if (info->srv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - root_signature->pool_sizes[i++].descriptorCount = info->srv_count; - } - /* Each D3D12_DESCRIPTOR_RANGE_TYPE_UAV descriptor can be either a - * buffer or a texture view. Allocate one buffer view and one image - * view Vulkan descriptor for each. */ - if (info->buffer_uav_count || info->uav_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->buffer_uav_count + info->uav_count; - } - if (info->uav_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - root_signature->pool_sizes[i++].descriptorCount = info->uav_count; - } - if (info->sampler_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLER; - root_signature->pool_sizes[i++].descriptorCount = info->sampler_count; - } - } - else - { - root_signature->pool_sizes = NULL; - root_signature->pool_size_count = 0; - } - - return S_OK; -} - static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature, const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info, struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1], @@ -874,7 +798,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->refcount = 1; root_signature->vk_pipeline_layout = VK_NULL_HANDLE; - root_signature->pool_sizes = NULL; root_signature->vk_push_set_layout = VK_NULL_HANDLE; root_signature->vk_set_layout = VK_NULL_HANDLE; root_signature->parameters = NULL; @@ -925,9 +848,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; context.current_binding = binding_desc; - if (FAILED(hr = d3d12_root_signature_init_descriptor_pool_size(root_signature, &info))) - goto fail; - if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context))) goto fail; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 51bfba967c7a..a8f42cf3b10a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -661,9 +661,6 @@ struct d3d12_root_signature VkDescriptorSetLayout vk_push_set_layout; VkDescriptorSetLayout vk_set_layout; - VkDescriptorPoolSize *pool_sizes; - size_t pool_size_count; - struct d3d12_root_parameter *parameters; unsigned int parameter_count; uint32_t main_set; -- 2.21.0

2 1

[PATCH vkd3d 5/6] vkd3d: Remove old entries in GPU VA allocator.
by Józef Kucia 06 Aug '19

06 Aug '19

From: Józef Kucia <jkucia(a)codeweavers.com> The "allocations" array is filled with unused entries when D3D12 buffers are destroyed. The majority of entries might be unused after running for a while. Remove the entry when VA is freed in order to prevent accumulation of unused entries. This makes destroying D3D12 buffers more expensive. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cb70578e9f4c..dc0fa0aaf885 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1895,6 +1895,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + unsigned int index; int rc; if ((rc = pthread_mutex_lock(&allocator->mutex))) @@ -1906,7 +1907,15 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12 allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, sizeof(*allocation), vkd3d_gpu_va_allocation_compare); if (allocation && allocation->base == address) - allocation->ptr = NULL; + { + index = allocation - allocator->allocations; + --allocator->allocation_count; + if (index != allocator->allocation_count) + { + memmove(&allocator->allocations[index], &allocator->allocations[index + 1], + (allocator->allocation_count - index) * sizeof(*allocation)); + } + } pthread_mutex_unlock(&allocator->mutex); } -- 2.21.0

2 1