June 2019 - Wine-Devel - list.winehq.org

Wine staging 4.10 release
by Alistair Leslie-Hughes June 11, 2019

June 11, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.10 (822 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. We have dropped the patch to support DirectX 10 with the legacy nVidia Driver, please use the nouveau driver. Upstreamed (Either directly from staging or fixed with a similar patch). * bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs. * bcrypt: Add BCryptDeriveKey stub. Added: * [47099] ntdll: Support for EXT4 case folding per directory. * [47326] dinput: Allow mapping of controls based of genre type. Updated: * libs-Debug_Channel * ntdll-Junction_Points * user32-msgbox-Support-WM_COPY-mesg * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ddraw: Factor out viewport_alloc_active_light_index() function.
by Paul Gofman June 11, 2019

June 11, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/light.c | 6 ++-- dlls/ddraw/viewport.c | 66 ++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a5fce2a15e..22910d7cc4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,6 +66,8 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) +#define DDRAW_MAX_ACTIVE_LIGHTS 8 + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, @@ -446,7 +448,7 @@ struct d3d_light D3DLIGHT2 light; D3DLIGHT7 light7; - DWORD dwLightIndex; + DWORD active_light_index; struct list entry; }; @@ -500,7 +502,7 @@ struct d3d_viewport /* If this viewport is active for one device, put the device here */ struct d3d_device *active_device; - DWORD num_lights; + DWORD active_lights_count; DWORD map_lights; enum ddraw_viewport_version version; diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c6513ffe8a..a86f046b74 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -39,7 +39,7 @@ static void light_update(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->dwLightIndex, &light->light7); + IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->active_light_index, &light->light7); } /***************************************************************************** @@ -61,7 +61,7 @@ void light_activate(struct d3d_light *light) light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); } /***************************************************************************** @@ -83,7 +83,7 @@ void light_deactivate(struct d3d_light *light) device = light->active_viewport->active_device; if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index daa5ac8d5a..31724402b3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,6 +122,34 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } +static void viewport_alloc_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + unsigned int i; + DWORD map; + + TRACE("vp %p, light %p, index %u, active_lights_count %u.\n", + vp, light, light->active_light_index, vp->active_lights_count); + + if (light->active_light_index) + return; + + if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS) + return; + + map = vp->map_lights; + + i = 0; + while (map & 1) + { + map >>= 1; + ++i; + } + light->active_light_index = i + 1; + ++vp->active_lights_count; + vp->map_lights |= 1u << i; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -753,23 +781,15 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if there are 8 lights or more * *****************************************************************************/ -static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirect3DLight *light) { - struct d3d_viewport *This = impl_from_IDirect3DViewport3(iface); - struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); - DWORD i = 0; - DWORD map = This->map_lights; + struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(light); + struct d3d_viewport *vp = impl_from_IDirect3DViewport3(viewport); - TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); + TRACE("viewport %p, light %p.\n", viewport, light); wined3d_mutex_lock(); - if (This->num_lights >= 8) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - if (light_impl->active_viewport) { wined3d_mutex_unlock(); @@ -777,22 +797,20 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D return D3DERR_LIGHTHASVIEWPORT; } - /* Find a light number and update both light and viewports objects accordingly */ - while (map & 1) + light_impl->active_viewport = vp; + viewport_alloc_active_light_index(light_impl); + if (!light_impl->active_light_index) { - map >>= 1; - ++i; + light_impl->active_viewport = NULL; + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } - light_impl->dwLightIndex = i; - This->num_lights++; - This->map_lights |= 1<<i; /* Add the light in the 'linked' chain */ - list_add_head(&This->light_list, &light_impl->entry); - IDirect3DLight_AddRef(lpDirect3DLight); + list_add_head(&vp->light_list, &light_impl->entry); + IDirect3DLight_AddRef(light); /* Attach the light to the viewport */ - light_impl->active_viewport = This; light_activate(light_impl); wined3d_mutex_unlock(); @@ -833,8 +851,8 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->num_lights; - viewport->map_lights &= ~(1 << l->dwLightIndex); + --viewport->active_lights_count; + viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock(); -- 2.21.0

4 13

[PATCH v2 1/3] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura June 11, 2019

June 11, 2019

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c66d46..c3d3b770b5c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.20.1

2 3

[PATCH vkd3d 06/12] vkd3d: Allocate device memory when heap offset is misaligned.
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> On radv with AMD Polaris GPUs, the alignment may be as high as 0x20000 or 0x40000. World of Warcraft seems to ignore the alignment returned from GetResourceAllocationInfo(), and simply aligns to 0x10000 (D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 15dac12abeb6..6bbd5afa2eea 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1492,7 +1492,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, } static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, - struct d3d12_resource *resource, struct d3d12_heap *heap, UINT64 heap_offset) + struct d3d12_resource *resource, struct d3d12_heap *heap, uint64_t heap_offset) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDevice vk_device = device->vk_device; @@ -1506,16 +1506,16 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, if (heap_offset % requirements.alignment) { - FIXME("Invalid heap offset %#"PRIx64".\n", heap_offset); - return E_INVALIDARG; + FIXME("Invalid heap offset %#"PRIx64" (alignment %#"PRIx64").\n", + heap_offset, requirements.alignment); + goto allocate_memory; } if (!(requirements.memoryTypeBits & (1u << heap->vk_memory_type))) { - FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x), " - "allocating device memory.\n", + FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x).\n", heap->vk_memory_type, resource, requirements.memoryTypeBits); - return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); + goto allocate_memory; } if (d3d12_resource_is_buffer(resource)) @@ -1534,6 +1534,10 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, } return hresult_from_vk_result(vr); + +allocate_memory: + FIXME("Allocating device memory.\n"); + return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, -- 2.21.0

2 1

[PATCH vkd3d 02/12] vkd3d: Invalidate current pipeline when DSV format is changed.
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0cbf0fb410ce..560b6971e29e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2305,6 +2305,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCom return E_NOTIMPL; } +static bool d3d12_command_list_has_unknown_dsv_format(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics; + + if (!d3d12_pipeline_state_is_graphics(list->state)) + return false; + + graphics = &list->state->u.graphics; + return graphics->null_attachment_mask & (1u << graphics->rt_count); +} + static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) { struct d3d12_graphics_pipeline_state *graphics; @@ -2312,8 +2323,7 @@ static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list assert(d3d12_pipeline_state_is_graphics(list->state)); graphics = &list->state->u.graphics; - return graphics->dsv_format - || (graphics->null_attachment_mask & (1u << graphics->rt_count) && list->dsv_format); + return graphics->dsv_format || (d3d12_command_list_has_unknown_dsv_format(list) && list->dsv_format); } static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, @@ -4321,6 +4331,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + VkFormat prev_dsv_format; struct vkd3d_view *view; unsigned int i; @@ -4373,6 +4384,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + prev_dsv_format = list->dsv_format; list->dsv = VK_NULL_HANDLE; list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) @@ -4402,6 +4414,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } } + if (prev_dsv_format != list->dsv_format && d3d12_command_list_has_unknown_dsv_format(list)) + d3d12_command_list_invalidate_current_pipeline(list); + d3d12_command_list_invalidate_current_framebuffer(list); d3d12_command_list_invalidate_current_render_pass(list); } -- 2.21.0

2 1

[PATCH vkd3d 11/12] vkd3d: Factor out vkd3d_create_thread().
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 25 ++++++------------------- libs/vkd3d/device.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 97cc7de1c59e..0c2fd3ea7e1f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -410,6 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device) { + HRESULT hr; int rc; TRACE("worker %p.\n", worker); @@ -437,28 +438,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return hresult_from_errno(rc); } - if (device->create_thread) - { - if (!(worker->u.handle = device->create_thread(vkd3d_fence_worker_main, worker))) - { - ERR("Failed to create fence worker thread.\n"); - pthread_mutex_destroy(&worker->mutex); - pthread_cond_destroy(&worker->cond); - return E_FAIL; - } - - return S_OK; - } - - if ((rc = pthread_create(&worker->u.thread, NULL, vkd3d_fence_worker_main, worker))) + if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, + vkd3d_fence_worker_main, worker, &worker->thread))) { - ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return hresult_from_errno(rc); } - return S_OK; + return hr; } HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, @@ -482,7 +469,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (device->join_thread) { - if (FAILED(hr = device->join_thread(worker->u.handle))) + if (FAILED(hr = device->join_thread(worker->thread.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); return hr; @@ -490,7 +477,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, } else { - if ((rc = pthread_join(worker->u.thread, NULL))) + if ((rc = pthread_join(worker->thread.pthread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); return hresult_from_errno(rc); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4df2462eed12..e88d3c2964e1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->create_thread = instance->create_thread; device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; @@ -3198,6 +3197,32 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->create_thread) + { + if (!(thread->handle = instance->create_thread(thread_main, data))) + { + ERR("Failed to create thread.\n"); + hr = E_FAIL; + } + } + else + { + if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) + { + ERR("Failed to create thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9191ae258956..2fbf6925098e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -141,13 +141,18 @@ struct vkd3d_instance LONG refcount; }; +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + +HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + struct vkd3d_fence_worker { - union - { - pthread_t thread; - void *handle; - } u; + union vkd3d_thread_handle thread; pthread_mutex_t mutex; pthread_cond_t cond; bool should_exit; @@ -1014,7 +1019,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_create_thread create_thread; PFN_vkd3d_join_thread join_thread; IUnknown *parent; -- 2.21.0

2 1

[PATCH vkd3d 12/12] vkd3d: Factor out vkd3d_join_thread().
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 18 ++---------------- libs/vkd3d/device.c | 23 ++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 +-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0c2fd3ea7e1f..fcb7a4899091 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -467,22 +467,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, pthread_mutex_unlock(&worker->mutex); - if (device->join_thread) - { - if (FAILED(hr = device->join_thread(worker->thread.handle))) - { - ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return hr; - } - } - else - { - if ((rc = pthread_join(worker->thread.pthread, NULL))) - { - ERR("Failed to join fence worker thread, error %d.\n", rc); - return hresult_from_errno(rc); - } - } + if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread))) + return hr; pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e88d3c2964e1..b1da9e9c0e20 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3112,7 +3112,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_instance_incref(device->vkd3d_instance = instance); device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; - device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; device->adapter_luid = create_info->adapter_luid; @@ -3223,6 +3222,28 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, return hr; } +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) +{ + HRESULT hr = S_OK; + int rc; + + if (instance->join_thread) + { + if (FAILED(hr = instance->join_thread(thread->handle))) + ERR("Failed to join thread, hr %#x.\n", hr); + } + else + { + if ((rc = pthread_join(thread->pthread, NULL))) + { + ERR("Failed to join thread, error %d.\n", rc); + hr = hresult_from_errno(rc); + } + } + + return hr; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fbf6925098e..4118d5d170e0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -149,6 +149,7 @@ union vkd3d_thread_handle HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; struct vkd3d_fence_worker { @@ -1019,8 +1020,6 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - PFN_vkd3d_join_thread join_thread; - IUnknown *parent; LUID adapter_luid; -- 2.21.0

2 1

[PATCH vkd3d 10/12] tests: Prefer uint64_t to UINT64.
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 90 ++++++++++++++++++++--------------------- tests/d3d12_crosstest.h | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 358e78486ad8..903c42396b60 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -224,8 +224,8 @@ static void upload_texture_data_(unsigned int line, ID3D12Resource *texture, { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts; + uint64_t *row_sizes, required_size; D3D12_RESOURCE_DESC resource_desc; - UINT64 *row_sizes, required_size; ID3D12Resource *upload_buffer; D3D12_MEMCPY_DEST dst_data; ID3D12Device *device; @@ -388,9 +388,9 @@ static uint16_t get_readback_uint16(struct resource_readback *rb, unsigned int x return *(uint16_t *)get_readback_data(rb, x, y, 0, sizeof(uint16_t)); } -static UINT64 get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y) +static uint64_t get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(UINT64 *)get_readback_data(rb, x, y, 0, sizeof(UINT64)); + return *(uint64_t *)get_readback_data(rb, x, y, 0, sizeof(uint64_t)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) @@ -1900,7 +1900,7 @@ static void test_create_heap(void) static const struct { - UINT64 alignment; + uint64_t alignment; HRESULT expected_hr; } tests[] = @@ -2887,7 +2887,7 @@ static void test_create_fence(void) ID3D12Device *device, *tmp_device; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3491,7 +3491,7 @@ static void test_cpu_signal_fence(void) unsigned int i, ret; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3626,7 +3626,7 @@ static void test_cpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1); ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); - hr = ID3D12Fence_SetEventOnCompletion(fence, ~(UINT64)0, event2); + hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2); ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_Signal(fence, 50); @@ -3673,7 +3673,7 @@ static void test_cpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - hr = ID3D12Fence_Signal(fence, ~(UINT64)0); + hr = ID3D12Fence_Signal(fence, ~(uint64_t)0); ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3682,7 +3682,7 @@ static void test_cpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - hr = ID3D12Fence_Signal(fence, ~(UINT64)0); + hr = ID3D12Fence_Signal(fence, ~(uint64_t)0); ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3761,7 +3761,7 @@ static void test_gpu_signal_fence(void) unsigned int i, ret; ID3D12Fence *fence; ULONG refcount; - UINT64 value; + uint64_t value; HRESULT hr; if (!(device = create_device())) @@ -3869,7 +3869,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1); ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); - hr = ID3D12Fence_SetEventOnCompletion(fence, ~(UINT64)0, event2); + hr = ID3D12Fence_SetEventOnCompletion(fence, ~(uint64_t)0, event2); ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); queue_signal(queue, fence, 50); @@ -3916,7 +3916,7 @@ static void test_gpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - queue_signal(queue, fence, ~(UINT64)0); + queue_signal(queue, fence, ~(uint64_t)0); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3925,7 +3925,7 @@ static void test_gpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); - queue_signal(queue, fence, ~(UINT64)0); + queue_signal(queue, fence, ~(uint64_t)0); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3980,7 +3980,7 @@ struct multithread_fence_wait_data { HANDLE event; ID3D12Fence *fence; - UINT64 value; + uint64_t value; }; static void fence_event_wait_main(void *untyped_data) @@ -4092,8 +4092,8 @@ static void test_multithread_fence_wait(void) static void test_fence_values(void) { + uint64_t value, next_value; ID3D12CommandQueue *queue; - UINT64 value, next_value; ID3D12Device *device; ID3D12Fence *fence; ULONG refcount; @@ -17668,12 +17668,12 @@ static void test_null_vbv(void) #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, - unsigned int sub_resource_idx, unsigned int sub_resource_count, UINT64 base_offset, + unsigned int sub_resource_idx, unsigned int sub_resource_count, uint64_t base_offset, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, const UINT *row_counts, - const UINT64 *row_sizes, UINT64 *total_size) + const uint64_t *row_sizes, uint64_t *total_size) { unsigned int miplevel, width, height, depth, row_count, row_size, row_pitch; - UINT64 offset, size, total; + uint64_t offset, size, total; unsigned int i; offset = total = 0; @@ -17722,8 +17722,8 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D static void test_get_copyable_footprints(void) { D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[10]; + uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; - UINT64 row_sizes[10], total_size; unsigned int sub_resource_count; unsigned int i, j, k, l; ID3D12Device *device; @@ -17779,9 +17779,9 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, }; - static const UINT64 base_offsets[] = + static const uint64_t base_offsets[] = { - 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(UINT64)0, + 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(uint64_t)0, }; static const struct { @@ -17953,7 +17953,7 @@ static void test_get_copyable_footprints(void) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[j]; - ok(l->Offset == ~(UINT64)0, "Got offset %"PRIu64".\n", l->Offset); + ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); @@ -17961,10 +17961,10 @@ static void test_get_copyable_footprints(void) ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); - ok(row_sizes[j] == ~(UINT64)0, "Got row size %"PRIu64".\n", row_sizes[j]); + ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); } - ok(total_size == ~(UINT64)0, "Got total size %"PRIu64".\n", total_size); + ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); } refcount = ID3D12Device_Release(device); @@ -21662,7 +21662,7 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + uint64_t timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC heap_desc; struct test_context_desc desc; @@ -21703,7 +21703,7 @@ static void test_query_timestamp(void) ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, - D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(uint64_t)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -21718,7 +21718,7 @@ static void test_query_timestamp(void) "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); } - time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; + time_diff = (uint64_t)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " @@ -21784,9 +21784,9 @@ static void test_query_pipeline_statistics(void) get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(UINT64); ++i) + for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(uint64_t); ++i) { - UINT64 value = get_readback_uint64(&rb, i, 0); + uint64_t value = get_readback_uint64(&rb, i, 0); ok(!value, "Element %d: Got %"PRIu64", expected 0.\n", i, value); } @@ -21914,7 +21914,7 @@ static void test_query_occlusion(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); - resource = create_readback_buffer(device, ARRAY_SIZE(tests) * sizeof(UINT64)); + resource = create_readback_buffer(device, ARRAY_SIZE(tests) * sizeof(uint64_t)); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21940,7 +21940,7 @@ static void test_query_occlusion(void) ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, tests[i].type, i); ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, tests[i].type, i, 1, - resource, i * sizeof(UINT64)); + resource, i * sizeof(uint64_t)); } vkd3d_test_set_context(NULL); @@ -21948,8 +21948,8 @@ static void test_query_occlusion(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { const bool samples_passed = tests[i].draw && tests[i].clear_depth > tests[i].depth; - const UINT64 result = get_readback_uint64(&rb, i, 0); - UINT64 expected_result; + const uint64_t result = get_readback_uint64(&rb, i, 0); + uint64_t expected_result; if (tests[i].type == D3D12_QUERY_TYPE_BINARY_OCCLUSION) expected_result = samples_passed ? 1 : 0; @@ -21969,7 +21969,7 @@ static void test_query_occlusion(void) static void test_resolve_non_issued_query_data(void) { - static const UINT64 initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef}; + static const uint64_t initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef}; ID3D12Resource *readback_buffer, *upload_buffer; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC heap_desc; @@ -21979,7 +21979,7 @@ static void test_resolve_non_issued_query_data(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; - UINT64 *timestamps; + uint64_t *timestamps; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -22049,7 +22049,7 @@ static void test_resolve_query_data_in_different_command_list(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr); - readback_buffer = create_readback_buffer(device, readback_buffer_capacity * sizeof(UINT64)); + readback_buffer = create_readback_buffer(device, readback_buffer_capacity * sizeof(uint64_t)); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -22072,7 +22072,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (i = 0; i < readback_buffer_capacity / 2; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t)); } hr = ID3D12GraphicsCommandList_Close(command_list); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -22083,14 +22083,14 @@ static void test_resolve_query_data_in_different_command_list(void) for (; i < readback_buffer_capacity; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(uint64_t)); } get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < readback_buffer_capacity; ++i) { - UINT64 expected_result = context.render_target_desc.Width * context.render_target_desc.Height; - UINT64 result = get_readback_uint64(&rb, i, 0); + uint64_t expected_result = context.render_target_desc.Width * context.render_target_desc.Height; + uint64_t result = get_readback_uint64(&rb, i, 0); ok(result == expected_result, "Got unexpected result %"PRIu64" at %u.\n", result, i); } @@ -22112,7 +22112,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; - UINT64 result; + uint64_t result; HRESULT hr; if (!init_test_context(&context, NULL)) @@ -22134,7 +22134,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); ok(SUCCEEDED(hr), "Failed to create query heap, hr %#x.\n", hr); - readback_buffer = create_readback_buffer(device, sizeof(UINT64)); + readback_buffer = create_readback_buffer(device, sizeof(uint64_t)); /* Read query results in the second command list. */ ID3D12GraphicsCommandList_ResolveQueryData(command_lists[1], @@ -27749,7 +27749,7 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; - UINT64 size; + uint64_t size; static const unsigned int alignments[] = { @@ -27823,7 +27823,7 @@ static void test_resource_allocation_info(void) } else { - ok(info.SizeInBytes == ~(UINT64)0, + ok(info.SizeInBytes == ~(uint64_t)0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(info.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); @@ -27868,7 +27868,7 @@ static void test_resource_allocation_info(void) } else { - ok(info.SizeInBytes == ~(UINT64)0, + ok(info.SizeInBytes == ~(uint64_t)0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 5df0b3225d1c..4a490628e483 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -198,7 +198,7 @@ static inline bool join_thread(HANDLE untyped_thread) } #endif -static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) +static HRESULT wait_for_fence(ID3D12Fence *fence, uint64_t value) { unsigned int ret; HANDLE event; -- 2.21.0

2 1

[PATCH vkd3d 08/12] vkd3d: Avoid allocating memory in d3d12_command_list_update_uav_counter_descriptors().
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cb7f0862de6c..f4ad829063dc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2721,11 +2721,11 @@ done: static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { + VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_pipeline_state *state = list->state; VkDevice vk_device = list->device->vk_device; - VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; unsigned int uav_counter_count; unsigned int i; @@ -2734,14 +2734,12 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); if (!vk_descriptor_set) return; - if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) - return; - for (i = 0; i < uav_counter_count; ++i) { const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; @@ -2762,7 +2760,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); - vkd3d_free(vk_descriptor_writes); VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); -- 2.21.0

2 1

[PATCH vkd3d 09/12] vkd3d: Prefer uint64_t to UINT64.
by Józef Kucia June 11, 2019

June 11, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/device.c | 10 +++++----- libs/vkd3d/resource.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f4ad829063dc..97cc7de1c59e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -944,7 +944,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, REFII static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - UINT64 completed_value; + uint64_t completed_value; int rc; TRACE("iface %p.\n", iface); @@ -1086,7 +1086,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * } HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) { struct d3d12_fence *object; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 870b88af8282..4df2462eed12 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2623,8 +2623,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; - UINT64 requested_alignment; - UINT64 estimated_size; + uint64_t requested_alignment; + uint64_t estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2694,7 +2694,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour return info; invalid: - info->SizeInBytes = ~(UINT64)0; + info->SizeInBytes = ~(uint64_t)0; /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ if (desc->SampleDesc.Count != 1) @@ -2890,7 +2890,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; const struct vkd3d_format *format; - UINT64 offset, size, total; + uint64_t offset, size, total; TRACE("iface %p, desc %p, first_sub_resource %u, sub_resource_count %u, base_offset %#"PRIx64", " "layouts %p, row_counts %p, row_sizes %p, total_bytes %p.\n", @@ -2904,7 +2904,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (row_sizes) memset(row_sizes, 0xff, sizeof(*row_sizes) * sub_resource_count); if (total_bytes) - *total_bytes = ~(UINT64)0; + *total_bytes = ~(uint64_t)0; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6bbd5afa2eea..d005fa8865aa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -265,7 +265,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) return impl_from_ID3D12Heap(iface); } -static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) +static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **data) { struct d3d12_device *device = heap->device; HRESULT hr = S_OK; @@ -1540,7 +1540,7 @@ allocate_memory: return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) { @@ -3036,7 +3036,7 @@ static D3D12_GPU_DESCRIPTOR_HANDLE * STDMETHODCALLTYPE d3d12_descriptor_heap_Get TRACE("iface %p, descriptor %p.\n", iface, descriptor); - descriptor->ptr = (UINT64)(intptr_t)heap->descriptors; + descriptor->ptr = (uint64_t)(intptr_t)heap->descriptors; return descriptor; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e01e00503081..9191ae258956 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -319,7 +319,7 @@ struct d3d12_fence }; HRESULT d3d12_fence_create(struct d3d12_device *device, - UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; + uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; /* ID3D12Heap */ struct d3d12_heap @@ -371,7 +371,7 @@ struct d3d12_resource void *map_ptr; struct d3d12_heap *heap; - UINT64 heap_offset; + uint64_t heap_offset; D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; @@ -399,7 +399,7 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, +HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, -- 2.21.0

2 1