wine-devel November 2018

wine-devel@winehq.org

75 participants
771 discussions

[PATCH] kernel32/tests: Fix skips for implemented functions.
by Nikolay Sivov 10 Nov '18

10 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0c99fca0d1..168bdd5e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4710,7 +4710,7 @@ static void test_GetFinalPathNameByHandleA(void) if (!pGetFinalPathNameByHandleA) { - skip("GetFinalPathNameByHandleA is missing\n"); + win_skip("GetFinalPathNameByHandleA is missing\n"); return; } @@ -4803,7 +4803,7 @@ static void test_GetFinalPathNameByHandleW(void) if (!pGetFinalPathNameByHandleW) { - skip("GetFinalPathNameByHandleW is missing\n"); + win_skip("GetFinalPathNameByHandleW is missing\n"); return; } @@ -5026,7 +5026,7 @@ static void test_post_completion(void) if (!pGetQueuedCompletionStatusEx) { - skip("GetQueuedCompletionStatusEx not available\n"); + win_skip("GetQueuedCompletionStatusEx not available\n"); CloseHandle( port ); return; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720f32..fe68d28e91 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2117,7 +2117,7 @@ static void test_IsWow64Process(void) if (!pIsWow64Process) { - skip("IsWow64Process is not available\n"); + win_skip("IsWow64Process is not available\n"); return; } @@ -3660,7 +3660,7 @@ static void test_largepages(void) SIZE_T size; if (!pGetLargePageMinimum) { - skip("No GetLargePageMinimum support.\n"); + win_skip("No GetLargePageMinimum support.\n"); return; } size = pGetLargePageMinimum(); -- 2.19.1

1 0

[PATCH 2/2] include: Add more PROCESSOR_ARCHITECTURE defines
by André Hentschel 10 Nov '18

10 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 9edd65ed3a..6b5b66002a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -653,6 +653,8 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 #define PROCESSOR_ARCHITECTURE_ARM64 12 +#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 +#define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */ -- 2.17.1

1 0

[PATCH 1/2] include: Add IMAGE_REL_ARM64_BRANCH19
by André Hentschel 10 Nov '18

10 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index b8a630e6d3..9edd65ed3a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3490,6 +3490,7 @@ typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; #define IMAGE_REL_ARM64_TOKEN 0x000C #define IMAGE_REL_ARM64_SECTION 0x000D #define IMAGE_REL_ARM64_ADDR64 0x000E +#define IMAGE_REL_ARM64_BRANCH19 0x000F /* IA64 relocation types */ #define IMAGE_REL_IA64_ABSOLUTE 0x0000 -- 2.17.1

1 0

[PATCH vkd3d 5/5] vkd3d: Validate heap type for render target and unordered access buffers.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 18 ++++++--- tests/d3d12.c | 94 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a2a00d3d5f57..78101a5e1aad 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1051,12 +1051,20 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->desc = *desc; - if (d3d12_resource_is_texture(resource) - && (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD - || heap_properties->Type == D3D12_HEAP_TYPE_READBACK)) + if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD + || heap_properties->Type == D3D12_HEAP_TYPE_READBACK) { - WARN("Texture cannot be created on a UPLOAD/READBACK heap.\n"); - return E_INVALIDARG; + if (d3d12_resource_is_texture(resource)) + { + WARN("Textures cannot be created on upload/readback heaps.\n"); + return E_INVALIDARG; + } + + if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) + { + WARN("Render target and unordered access buffers cannot be created on upload/readback heaps.\n"); + return E_INVALIDARG; + } } if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD && initial_state != D3D12_RESOURCE_STATE_GENERIC_READ) diff --git a/tests/d3d12.c b/tests/d3d12.c index 92b37a3fc549..1ddf7c2d4a48 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1669,10 +1669,26 @@ static void test_create_committed_resource(void) D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; + D3D12_RESOURCE_STATES state; ID3D12Resource *resource; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + D3D12_HEAP_TYPE heap_type; + D3D12_RESOURCE_FLAGS flags; + } + invalid_buffer_desc_tests[] = + { + /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */ + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + }; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -1876,6 +1892,33 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = invalid_buffer_desc_tests[i].heap_type; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = invalid_buffer_desc_tests[i].flags; + + if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD) + state = D3D12_RESOURCE_STATE_GENERIC_READ; + else + state = D3D12_RESOURCE_STATE_COPY_DEST; + + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, state, NULL, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } @@ -2014,12 +2057,28 @@ static void test_create_placed_resource(void) D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; + D3D12_RESOURCE_STATES state; D3D12_HEAP_DESC heap_desc; ID3D12Resource *resource; ID3D12Heap *heap; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + D3D12_HEAP_TYPE heap_type; + D3D12_RESOURCE_FLAGS flags; + } + invalid_buffer_desc_tests[] = + { + /* Render target or unordered access resources are not allowed with UPLOAD or READBACK. */ + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + }; + if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -2090,6 +2149,41 @@ static void test_create_placed_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12Heap_Release(heap); + + for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i) + { + heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = invalid_buffer_desc_tests[i].heap_type; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Test %u: Failed to create heap, hr %#x.\n", i, hr); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = invalid_buffer_desc_tests[i].flags; + + if (invalid_buffer_desc_tests[i].heap_type == D3D12_HEAP_TYPE_UPLOAD) + state = D3D12_RESOURCE_STATE_GENERIC_READ; + else + state = D3D12_RESOURCE_STATE_COPY_DEST; + + hr = ID3D12Device_CreatePlacedResource(device, heap, 0, + &resource_desc, state, &clear_value, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + + ID3D12Heap_Release(heap); + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d: Translate pthread error numbers to HRESULTs.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 20 ++++++++++---------- libs/vkd3d/device.c | 2 +- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/utils.c | 18 ++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5ccf492e663d..9e5921ef81e2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -33,7 +33,7 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, { ERR("Failed to initialize mutex, error %d.\n", rc); vkd3d_free(object); - return E_FAIL; + return hresult_from_errno(rc); } object->vk_family_index = family_index; @@ -89,7 +89,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (!vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size, @@ -255,14 +255,14 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_init(&worker->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if ((rc = pthread_cond_init(&worker->cond, NULL))) { ERR("Failed to initialize condition variable, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); - return E_FAIL; + return hresult_from_errno(rc); } if (device->create_thread) @@ -283,7 +283,7 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); pthread_cond_destroy(&worker->cond); - return E_FAIL; + return hresult_from_errno(rc); } return S_OK; @@ -300,7 +300,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if ((rc = pthread_mutex_lock(&worker->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } worker->should_exit = true; @@ -321,7 +321,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if ((rc = pthread_join(worker->u.thread, NULL))) { ERR("Failed to join fence worker thread, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } } @@ -472,7 +472,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (value <= fence->value) @@ -521,7 +521,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 v if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } fence->value = value; @@ -580,7 +580,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if ((rc = pthread_mutex_init(&fence->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (flags) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e41a309a21a5..c85405024e75 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1275,7 +1275,7 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 21096e5e3e3d..a2a00d3d5f57 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -245,7 +245,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **dat { ERR("Failed to lock mutex, error %d.\n", rc); *data = NULL; - return E_FAIL; + return hresult_from_errno(rc); } if (!heap->map_ptr) @@ -365,7 +365,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if ((rc = pthread_mutex_init(&heap->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; + return hresult_from_errno(rc); } if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index a2424449660c..b7ebbdd75bdd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -18,6 +18,8 @@ #include "vkd3d_private.h" +#include <errno.h> + #define COLOR (VK_IMAGE_ASPECT_COLOR_BIT) #define DEPTH (VK_IMAGE_ASPECT_DEPTH_BIT) #define STENCIL (VK_IMAGE_ASPECT_STENCIL_BIT) @@ -381,6 +383,22 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) return vkd3d_dbg_sprintf("%s", &buffer[3]); } +HRESULT hresult_from_errno(int rc) +{ + switch (rc) + { + case 0: + return S_OK; + case ENOMEM: + return E_OUTOFMEMORY; + case EINVAL: + return E_INVALIDARG; + default: + FIXME("Unhandled errno %d.\n", rc); + return E_FAIL; + } +} + HRESULT hresult_from_vk_result(VkResult vr) { switch (vr) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 982ed68f0089..d6c821b75884 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -896,6 +896,7 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d: Implement Map() for placed resources.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 142 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 7 ++ 2 files changed, 131 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f857de2dcf0d..21096e5e3e3d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -146,6 +146,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); + pthread_mutex_destroy(&heap->mutex); + vkd3d_free(heap); ID3D12Device_Release(&device->ID3D12Device_iface); @@ -233,6 +235,76 @@ 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) +{ + struct d3d12_device *device = heap->device; + VkResult vr; + int rc; + + if ((rc = pthread_mutex_lock(&heap->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + *data = NULL; + return E_FAIL; + } + + if (!heap->map_ptr) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + TRACE("Mapping heap %p.\n", heap); + + if ((vr = VK_CALL(vkMapMemory(device->vk_device, heap->vk_memory, + 0, VK_WHOLE_SIZE, 0, &heap->map_ptr))) < 0) + { + WARN("Failed to map device memory, vr %d.\n", vr); + heap->map_ptr = NULL; + *data = NULL; + pthread_mutex_unlock(&heap->mutex); + return hresult_from_vk_result(vr); + } + } + + *data = (BYTE *)heap->map_ptr + offset; + ++heap->map_count; + + pthread_mutex_unlock(&heap->mutex); + + return S_OK; +} + +static void d3d12_heap_unmap(struct d3d12_heap *heap) +{ + struct d3d12_device *device = heap->device; + int rc; + + if ((rc = pthread_mutex_lock(&heap->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + if (heap->map_count) + { + --heap->map_count; + if (!heap->map_count) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + TRACE("Unmapping heap %p.\n", heap); + + VK_CALL(vkUnmapMemory(device->vk_device, heap->vk_memory)); + heap->map_ptr = NULL; + } + } + else + { + WARN("Heap %p is not mapped.\n", heap); + } + + pthread_mutex_unlock(&heap->mutex); +} + static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) { if (!desc->SizeInBytes) @@ -262,12 +334,16 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, { VkMemoryRequirements memory_requirements; HRESULT hr; + int rc; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; heap->desc = *desc; + heap->map_ptr = NULL; + heap->map_count = 0; + if (!heap->desc.Properties.CreationNodeMask) heap->desc.Properties.CreationNodeMask = 1; if (!heap->desc.Properties.VisibleNodeMask) @@ -286,9 +362,18 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, memory_requirements.alignment = heap->desc.Alignment; memory_requirements.memoryTypeBits = ~(uint32_t)0; + if ((rc = pthread_mutex_init(&heap->mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) + { + pthread_mutex_destroy(&heap->mutex); return hr; + } heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -726,15 +811,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT const D3D12_RANGE *read_range, void **data) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - const struct vkd3d_vk_device_procs *vk_procs; struct d3d12_device *device; VkResult vr; + HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); device = resource->device; - vk_procs = &device->vk_procs; if (!is_cpu_accessible_heap(&resource->heap_properties)) { @@ -749,7 +833,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT return E_INVALIDARG; } - if (!resource->vk_memory) + if (!resource->heap && !resource->vk_memory) { FIXME("Not implemented for this resource type.\n"); return E_NOTIMPL; @@ -759,11 +843,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (!resource->map_count) { - if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, - 0, VK_WHOLE_SIZE, 0, &resource->map_data))) < 0) + if (resource->heap) { - WARN("Failed to map device memory, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_data); + } + else + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, + 0, VK_WHOLE_SIZE, 0, &resource->map_data))) < 0) + WARN("Failed to map device memory, vr %d.\n", vr); + + hr = hresult_from_vk_result(vr); + } + + if (FAILED(hr)) + { + WARN("Failed to map resource, hr %#x.\n", hr); + resource->map_data = NULL; + *data = NULL; + return hr; } } @@ -777,32 +877,32 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s const D3D12_RANGE *written_range) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - const struct vkd3d_vk_device_procs *vk_procs; struct d3d12_device *device; TRACE("iface %p, sub_resource %u, written_range %p.\n", iface, sub_resource, written_range); - device = resource->device; - vk_procs = &device->vk_procs; - - if (d3d12_resource_is_texture(resource)) - { - FIXME("Not implemented for textures.\n"); - return; - } - if (!resource->map_count) { WARN("Resource %p is not mapped.\n", resource); return; } + device = resource->device; + + WARN("Ignoring written range %p.\n", written_range); + --resource->map_count; if (!resource->map_count) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + resource->map_data = NULL; - VK_CALL(vkUnmapMemory(device->vk_device, resource->vk_memory)); + + if (resource->heap) + d3d12_heap_unmap(resource->heap); + else + VK_CALL(vkUnmapMemory(device->vk_device, resource->vk_memory)); } } @@ -1093,6 +1193,9 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return hr; } + object->heap = NULL; + object->heap_offset = 0; + TRACE("Created committed resource %p.\n", object); *resource = object; @@ -1155,6 +1258,9 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return hr; } + object->heap = heap; + object->heap_offset = heap_offset; + TRACE("Created placed resource %p.\n", object); *resource = object; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a2bf4048aebb..982ed68f0089 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -194,7 +194,11 @@ struct d3d12_heap D3D12_HEAP_DESC desc; + pthread_mutex_t mutex; + VkDeviceMemory vk_memory; + void *map_ptr; + unsigned int map_count; uint32_t vk_memory_type; struct d3d12_device *device; @@ -229,6 +233,9 @@ struct d3d12_resource unsigned int map_count; void *map_data; + struct d3d12_heap *heap; + UINT64 heap_offset; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_HEAP_FLAGS heap_flags; D3D12_RESOURCE_STATES initial_state; -- 2.18.1

2 1

[PATCH vkd3d 3/5] tests: Add test for mapping placed resources.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index eb31438a7381..92b37a3fc549 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5319,6 +5319,192 @@ static void test_map_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_map_placed_resources(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12GraphicsCommandList *command_list; + ID3D12Heap *upload_heap, *readback_heap; + D3D12_ROOT_PARAMETER root_parameters[2]; + D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *readback_buffer; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *uav_buffer; + D3D12_HEAP_DESC heap_desc; + ID3D12CommandQueue *queue; + ID3D12Resource *cb[4]; + uint32_t *cb_data[4]; + ID3D12Device *device; + D3D12_RANGE range; + unsigned int i; + uint32_t *ptr; + HRESULT hr; + + STATIC_ASSERT(ARRAY_SIZE(cb) == ARRAY_SIZE(cb_data)); + + static const DWORD ps_code[] = + { +#if 0 + uint offset; + uint value; + + RWByteAddressBuffer u; + + void main() + { + u.Store(offset, value); + } +#endif + 0x43425844, 0x0dcbdd90, 0x7dad2857, 0x4ee149ee, 0x72a13d21, 0x00000001, 0x000000a4, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000050, 0x00000050, 0x00000014, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, 0x00000000, 0x090000a6, + 0x0011e012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const uint32_t expected_values[] = {0xdead, 0xbeef, 0xfeed, 0xc0de}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[1].Descriptor.ShaderRegister = 0; + root_parameters[1].Descriptor.RegisterSpace = 0; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters);; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_pipeline_state(device, context.root_signature, 0, NULL, &ps, NULL); + + heap_desc.SizeInBytes = ARRAY_SIZE(cb) * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_UPLOAD; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&upload_heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + heap_desc.SizeInBytes = 1024; + heap_desc.Properties.Type = D3D12_HEAP_TYPE_READBACK; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&readback_heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(cb); ++i) + { + hr = ID3D12Device_CreatePlacedResource(device, upload_heap, + i * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Resource, (void **)&cb[i]); + ok(hr == S_OK, "Failed to create placed resource %u, hr %#x.\n", i, hr); + } + + resource_desc.Width = 1024; + hr = ID3D12Device_CreatePlacedResource(device, readback_heap, 0, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &IID_ID3D12Resource, (void **)&readback_buffer); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + uav_buffer = create_default_buffer(device, resource_desc.Width, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + for (i = 0; i < ARRAY_SIZE(cb); ++i) + { + hr = ID3D12Resource_Map(cb[i], 0, NULL, (void **)&cb_data[i]); + ok(hr == S_OK, "Failed to map buffer %u, hr %#x.\n", i, hr); + } + + hr = ID3D12Resource_Map(cb[0], 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + ok(ptr == cb_data[0], "Got map ptr %p, expected %p.\n", ptr, cb_data[0]); + cb_data[0][0] = 0; + cb_data[0][1] = expected_values[0]; + ID3D12Resource_Unmap(cb[0], 0, NULL); + ID3D12Resource_Unmap(cb[0], 0, NULL); + cb_data[0] = NULL; + + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(uav_buffer)); + + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(cb[0])); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(cb[2])); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + cb_data[2][0] = 4; + cb_data[2][1] = expected_values[1]; + + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(cb[1])); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + cb_data[1][0] = 8; + cb_data[1][1] = expected_values[2]; + + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(cb[3])); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + cb_data[3][0] = 12; + cb_data[3][1] = expected_values[3]; + range.Begin = 0; + range.End = 2 * sizeof(uint32_t); + ID3D12Resource_Unmap(cb[3], 0, &range); + cb_data[3] = NULL; + + transition_resource_state(command_list, uav_buffer, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_CopyResource(command_list, readback_buffer, uav_buffer); + + get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + unsigned int value = get_readback_uint(&rb, i, 0, 0); + ok(value == expected_values[i], "Got %#x, expected %#x at %u.\n", value, expected_values[i], i); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(uav_buffer); + for (i = 0; i < ARRAY_SIZE(cb); ++i) + ID3D12Resource_Release(cb[i]); + ID3D12Resource_Release(readback_buffer); + ID3D12Heap_Release(upload_heap); + ID3D12Heap_Release(readback_heap); + destroy_test_context(&context); +} + static void test_bundle_state_inheritance(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -21227,6 +21413,7 @@ START_TEST(d3d12) run_test(test_invalid_texture_resource_barriers); run_test(test_device_removed_reason); run_test(test_map_resource); + run_test(test_map_placed_resources); run_test(test_bundle_state_inheritance); run_test(test_shader_instructions); run_test(test_compute_shader_instructions); -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Use create_pipeline_state() in more places.
by Józef Kucia 10 Nov '18

10 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 21 +++------------------ tests/vkd3d_d3d12_test.h | 7 +++++-- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c855e9c42cbb..eb31438a7381 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4840,7 +4840,6 @@ static void test_draw_uav_only(void) { ID3D12DescriptorHeap *cpu_descriptor_heap, *descriptor_heap; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; D3D12_DESCRIPTOR_RANGE descriptor_range; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; @@ -4896,11 +4895,7 @@ static void test_draw_uav_only(void) hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); - init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); - pso_desc.NumRenderTargets = 0; - hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&context.pipeline_state); - ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr); + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); resource = create_default_texture(context.device, 1, 1, DXGI_FORMAT_R32_SINT, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -16633,7 +16628,6 @@ static void test_atomic_instructions(void) { ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; - D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12PipelineState *pipeline_state; @@ -16799,11 +16793,7 @@ static void test_atomic_instructions(void) cs_buffer2 = create_default_buffer(device, sizeof(tests->input), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps_atomics, NULL); - pso_desc.NumRenderTargets = 0; - hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&context.pipeline_state); - ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr); + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps_atomics, NULL); pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_atomics); @@ -20426,7 +20416,6 @@ static void test_clip_distance(void) static void test_combined_clip_and_cull_distances(void) { - D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_VERTEX_BUFFER_VIEW vbv[2]; @@ -20437,7 +20426,6 @@ static void test_combined_clip_and_cull_distances(void) ID3D12Resource *vb[2]; ID3D12Device *device; unsigned int i, j, k; - HRESULT hr; static const DWORD vs_code[] = { @@ -20575,11 +20563,8 @@ static void test_combined_clip_and_cull_distances(void) input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc); - init_pipeline_state_desc(&pso_desc, context.root_signature, + context.pipeline_state = create_pipeline_state(device, context.root_signature, context.render_target_desc.Format, &vs, NULL, &input_layout); - hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&context.pipeline_state); - ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); vb[0] = create_upload_buffer(device, sizeof(quad), quad); vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 596a9b8b272f..28225e1749d2 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -486,8 +486,11 @@ static void init_pipeline_state_desc(D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, desc->InputLayout = *input_layout; desc->SampleMask = ~(UINT)0; desc->PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; - desc->NumRenderTargets = 1; - desc->RTVFormats[0] = rt_format; + if (rt_format) + { + desc->NumRenderTargets = 1; + desc->RTVFormats[0] = rt_format; + } desc->SampleDesc.Count = 1; } -- 2.18.1

2 1

[PATCH] tchar.h: Fixed the Unicode expansion of _sntprintf.
by Mihail Ivanchev 09 Nov '18

09 Nov '18

1 0

[PATCH] wpp: Skip parsing #if expression if it's ignored anyway.
by Jacek Caban 09 Nov '18

09 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- libs/wpp/ppl.l | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2018