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

Henri Verbeet : wined3d: Make the adapter responsible for shader resource view creation and destruction.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: a3241fa2a801094a2f4c75883537487bd3d7d312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3241fa2a801094a2f4c7588… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:11 2019 +0430 wined3d: Make the adapter responsible for shader resource view creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 48 +++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++++++++++++ dlls/wined3d/directx.c | 17 +++++++++ dlls/wined3d/view.c | 81 +++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 23 ++++++++++++ 5 files changed, 172 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3241fa2a801094a2f4c…

1 0

Conor McCarthy : vkd3d: Use linear tiling for CPU readable textures.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: vkd3d Branch: master Commit: 686eb92252257efc4eb4ad78b98e9609fe04ea23 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=686eb92252257efc4eb4ad7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 7 15:58:23 2019 +0200 vkd3d: Use linear tiling for CPU readable textures. Enables ReadFromSubresource() to succeed in cases where it would have failed otherwise. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 56 +++++++++++++++++++++++++++++++++++++--------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3a4eefe..0842859 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -795,9 +795,30 @@ static const struct vkd3d_format_compatibility_list *vkd3d_get_format_compatibil return NULL; } +static bool vkd3d_is_linear_tiling_supported(const struct d3d12_device *device, VkImageCreateInfo *image_info) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkImageFormatProperties properties; + VkResult vr; + + if ((vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(device->vk_physical_device, image_info->format, + image_info->imageType, VK_IMAGE_TILING_LINEAR, image_info->usage, image_info->flags, &properties))) < 0) + { + if (vr != VK_ERROR_FORMAT_NOT_SUPPORTED) + WARN("Failed to get device image format properties, vr %d.\n", vr); + + return false; + } + + return image_info->extent.depth <= properties.maxExtent.depth + && image_info->mipLevels <= properties.maxMipLevels + && image_info->arrayLayers <= properties.maxArrayLayers + && (image_info->samples & properties.sampleCounts); +} + static HRESULT vkd3d_create_image(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, VkImage *vk_image) + const D3D12_RESOURCE_DESC *desc, struct d3d12_resource *resource, VkImage *vk_image) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format_compatibility_list *compat_list; @@ -913,16 +934,29 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.pQueueFamilyIndices = NULL; } - image_info.initialLayout = heap_properties && is_cpu_accessible_heap(heap_properties) ? - VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; + if (heap_properties && is_cpu_accessible_heap(heap_properties)) + { + image_info.initialLayout = VK_IMAGE_LAYOUT_PREINITIALIZED; - if ((vr = VK_CALL(vkCreateImage(device->vk_device, &image_info, NULL, vk_image))) < 0) + if (vkd3d_is_linear_tiling_supported(device, &image_info)) + { + /* Required for ReadFromSubresource(). */ + WARN("Forcing VK_IMAGE_TILING_LINEAR for CPU readable texture.\n"); + image_info.tiling = VK_IMAGE_TILING_LINEAR; + } + } + else { - WARN("Failed to create Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; } - return S_OK; + if (resource && image_info.tiling == VK_IMAGE_TILING_LINEAR) + resource->flags |= VKD3D_RESOURCE_LINEAR_TILING; + + if ((vr = VK_CALL(vkCreateImage(device->vk_device, &image_info, NULL, vk_image))) < 0) + WARN("Failed to create Vulkan image, vr %d.\n", vr); + + return hresult_from_vk_result(vr); } HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, @@ -946,7 +980,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, } /* XXX: We have to create an image to get its memory requirements. */ - if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, &vk_image))) + if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, NULL, &vk_image))) { VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &requirements)); VK_CALL(vkDestroyImage(device->vk_device, vk_image, NULL)); @@ -1462,7 +1496,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->desc.MipLevels = max_miplevel_count(desc); resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(device, heap_properties, heap_flags, - &resource->desc, &resource->u.vk_image))) + &resource->desc, resource, &resource->u.vk_image))) return hr; break; @@ -3686,7 +3720,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE; if (FAILED(hr = vkd3d_create_image(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, &null_resources->vk_2d_image))) + &resource_desc, NULL, &null_resources->vk_2d_image))) goto fail; if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_image, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory, NULL, NULL))) @@ -3707,7 +3741,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; if (FAILED(hr = vkd3d_create_image(device, use_sparse_resources ? NULL : &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, &null_resources->vk_2d_storage_image))) + &resource_desc, NULL, &null_resources->vk_2d_storage_image))) goto fail; if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory, NULL, NULL))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a8f42cf..294e677 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -382,6 +382,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDE (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 #define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 +#define VKD3D_RESOURCE_LINEAR_TILING 0x00000010 /* ID3D12Resource */ struct d3d12_resource

1 0

Conor McCarthy : vkd3d: Implement ID3D12Resource::ReadFromSubresource().
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: vkd3d Branch: master Commit: d5a8fbe9f5c679a4fea3e43ebc132dd5662eb186 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d5a8fbe9f5c679a4fea3e43… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 7 15:58:24 2019 +0200 vkd3d: Implement ID3D12Resource::ReadFromSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++--- tests/d3d12.c | 13 ++++--- 2 files changed, 102 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 0842859..cb2edd1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1269,12 +1269,101 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour void *dst_data, UINT dst_row_pitch, UINT dst_slice_pitch, UINT src_sub_resource, const D3D12_BOX *src_box) { - FIXME("iface %p, dst_data %p, dst_row_pitch %u, dst_slice_pitch %u, " - "src_sub_resource %u, src_box %p stub!\n", - iface, dst_data, dst_row_pitch, dst_slice_pitch, - src_sub_resource, src_box); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + const struct vkd3d_vk_device_procs *vk_procs; + VkImageSubresource vk_sub_resource; + const struct vkd3d_format *format; + VkSubresourceLayout vk_layout; + struct d3d12_device *device; + BYTE *src_data, *src, *dst; + unsigned int y, z; + D3D12_BOX box; + size_t size; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, dst_data %p, dst_row_pitch %u, dst_slice_pitch %u, " + "src_sub_resource %u, src_box %p.\n", + iface, dst_data, dst_row_pitch, dst_slice_pitch, src_sub_resource, src_box); + + if (d3d12_resource_is_buffer(resource)) + { + WARN("Buffers are not supported.\n"); + return E_INVALIDARG; + } + + device = resource->device; + vk_procs = &device->vk_procs; + + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) + { + ERR("Invalid DXGI format %#x.\n", resource->desc.Format); + return E_INVALIDARG; + } + if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + { + FIXME("Not supported for format %#x.\n", format->dxgi_format); + return E_NOTIMPL; + } + + vk_sub_resource.arrayLayer = src_sub_resource / resource->desc.MipLevels; + vk_sub_resource.mipLevel = src_sub_resource % resource->desc.MipLevels; + vk_sub_resource.aspectMask = format->vk_aspect_mask; + + if (src_box) + { + box = *src_box; + } + else + { + box.left = 0; + box.top = 0; + box.front = 0; + box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); + box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); + box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + } + if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + return S_OK; + + if (!d3d12_resource_is_cpu_accessible(resource)) + { + FIXME_ONCE("Not implemented for this resource type.\n"); + return E_NOTIMPL; + } + if (!(resource->flags & VKD3D_RESOURCE_LINEAR_TILING)) + { + FIXME_ONCE("Not implemented for image tiling other than VK_IMAGE_TILING_LINEAR.\n"); + return E_NOTIMPL; + } + + VK_CALL(vkGetImageSubresourceLayout(device->vk_device, resource->u.vk_image, &vk_sub_resource, &vk_layout)); + TRACE("Offset %#"PRIx64", size %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n", + vk_layout.offset, vk_layout.size, vk_layout.rowPitch, vk_layout.depthPitch); + + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, (void **)&src_data))) + { + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); + return hr; + } + + src_data += vk_layout.offset; + src_data += box.left / format->block_width * format->byte_count * format->block_byte_count; + size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = box.front; z < box.back; ++z) + { + dst = dst_data + (z - box.front) * dst_slice_pitch; + src = src_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; + for (y = box.top; y < box.bottom; y += format->block_height) + { + memcpy(dst, src, size); + dst += dst_row_pitch; + src += vk_layout.rowPitch; + } + } + + d3d12_heap_unmap(resource->heap, resource); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 95eb90d..63375b0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30434,7 +30434,7 @@ static void test_read_write_subresource(void) todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12Resource_Release(rb_buffer); @@ -30468,7 +30468,8 @@ static void test_read_write_subresource(void) todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_if(is_nvidia_device(device)) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Empty box */ set_box(&box, 0, 0, 0, 0, 0, 0); @@ -30476,7 +30477,7 @@ static void test_read_write_subresource(void) todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); for (z = 0; z < 64; ++z) { @@ -30511,13 +30512,15 @@ static void test_read_write_subresource(void) /* Read region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_if(is_nvidia_device(device)) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Read region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch, 0, &box); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_if(is_nvidia_device(device)) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); for (z = 0; z < 64; ++z) {

1 0

Conor McCarthy : tests: Add more tests for ReadFromSubresource().
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: vkd3d Branch: master Commit: f2753dd6189dea09da835100fad3c58a3062a7be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f2753dd6189dea09da83510… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 7 15:58:25 2019 +0200 tests: Add more tests for ReadFromSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 131 +++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 51 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 63375b0..cc7113a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30390,6 +30390,7 @@ static void test_vertex_shader_stream_output(void) static void test_read_write_subresource(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + uint32_t *dst_buffer, *zero_buffer, *ptr; ID3D12GraphicsCommandList *command_list; D3D12_HEAP_PROPERTIES heap_properties; D3D12_SUBRESOURCE_DATA texture_data; @@ -30399,16 +30400,14 @@ static void test_read_write_subresource(void) struct resource_readback rb; ID3D12Resource *src_texture; ID3D12Resource *dst_texture; - unsigned int got, expected; ID3D12CommandQueue *queue; ID3D12Resource *rb_buffer; - unsigned int *dst_buffer; unsigned int buffer_size; unsigned int slice_pitch; + unsigned int x, y, z, i; unsigned int row_pitch; - unsigned int x, y, z; + uint32_t got, expected; ID3D12Device *device; - unsigned int *ptr; D3D12_BOX box; HRESULT hr; @@ -30428,6 +30427,9 @@ static void test_read_write_subresource(void) rb_buffer = create_readback_buffer(device, buffer_size); dst_buffer = malloc(buffer_size); ok(dst_buffer, "Failed to allocate memory.\n"); + zero_buffer = malloc(buffer_size); + ok(zero_buffer, "Failed to allocate memory.\n"); + memset(zero_buffer, 0, buffer_size); set_box(&box, 0, 0, 0, 1, 1, 1); hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch); @@ -30479,73 +30481,99 @@ static void test_read_write_subresource(void) hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - for (z = 0; z < 64; ++z) + for (i = 0; i < 2; ++i) { - for (y = 0; y < 100; ++y) + vkd3d_test_set_context("Test %u", i); + + for (z = 0; z < 64; ++z) { - for (x = 0; x < 128; ++x) + for (y = 0; y < 100; ++y) { - ptr = &dst_buffer[z * 128 * 100 + y * 128 + x]; - if (x < 2 && y< 2 && z < 2) /* Region 1 */ - *ptr = (z + 1) << 16 | (y + 1) << 8 | (x + 1); - else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ - *ptr = (z + 2) << 16 | (y + 2) << 8 | (x + 2); - else - *ptr = 0xdeadbeef; + for (x = 0; x < 128; ++x) + { + ptr = &dst_buffer[z * 128 * 100 + y * 128 + x]; + if (x < 2 && y< 2 && z < 2) /* Region 1 */ + *ptr = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + *ptr = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else + *ptr = 0xdeadbeef; + } } } - } - /* Write region 1 */ - set_box(&box, 0, 0, 0, 2, 2, 2); - hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (i) + { + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Write region 2 */ - set_box(&box, 2, 2, 2, 11, 13, 17); - hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], - row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Write region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - memset(dst_buffer, 0, buffer_size); + /* Write region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], + row_pitch, slice_pitch); + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + /* Upload the test data */ + transition_resource_state(command_list, src_texture, + D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_COPY_DEST); + texture_data.pData = dst_buffer; + texture_data.RowPitch = row_pitch; + texture_data.SlicePitch = slice_pitch; + upload_texture_data(src_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, src_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); + } - /* Read region 1 */ - set_box(&box, 0, 0, 0, 2, 2, 2); - hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + memset(dst_buffer, 0, buffer_size); - /* Read region 2 */ - set_box(&box, 2, 2, 2, 11, 13, 17); - hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, - slice_pitch, 0, &box); - todo_if(is_nvidia_device(device)) - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Read region 1 */ + set_box(&box, 0, 0, 0, 2, 2, 2); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + todo_if(is_nvidia_device(device)) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - for (z = 0; z < 64; ++z) - { - for (y = 0; y < 100; ++y) + /* Read region 2 */ + set_box(&box, 2, 2, 2, 11, 13, 17); + hr = ID3D12Resource_ReadFromSubresource(src_texture, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, + slice_pitch, 0, &box); + todo_if(is_nvidia_device(device)) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 64; ++z) { - for (x = 0; x < 128; ++x) + for (y = 0; y < 100; ++y) { - if (x < 2 && y < 2 && z < 2) /* Region 1 */ - expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); - else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ - expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); - else /* Untouched */ - expected = 0; - - got = dst_buffer[z * 128 * 100 + y * 128 + x]; + for (x = 0; x < 128; ++x) + { + if (x < 2 && y < 2 && z < 2) /* Region 1 */ + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + else if (2 <= x && x < 11 && 2 <= y && y < 13 && 2 <= z && z < 17) /* Region 2 */ + expected = (z + 2) << 16 | (y + 2) << 8 | (x + 2); + else /* Untouched */ + expected = 0; + + got = dst_buffer[z * 128 * 100 + y * 128 + x]; + if (got != expected) + break; + } if (got != expected) break; } if (got != expected) break; } - if (got != expected) - break; + todo_if(is_nvidia_device(device)) + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); } - todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + vkd3d_test_set_context(NULL); /* Test layout is the same */ dst_texture = create_default_texture3d(device, 128, 100, 64, 1, DXGI_FORMAT_R8G8B8A8_UNORM, 0, @@ -30601,6 +30629,7 @@ static void test_read_write_subresource(void) done: free(dst_buffer); + free(zero_buffer); destroy_test_context(&context); }

1 0

Józef Kucia : vkd3d: Validate src_box in ReadFromSubresource().
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: vkd3d Branch: master Commit: d1492e34656c1d63283a35029e26f831aced3353 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1492e34656c1d63283a350… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 7 15:58:26 2019 +0200 vkd3d: Validate src_box in ReadFromSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 40 ++++++++++++++++++++++++++++++-- tests/d3d12.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cb2edd1..463f373 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1041,6 +1041,33 @@ bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) return resource->heap && is_cpu_accessible_heap(&resource->heap->desc.Properties); } +static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, + unsigned int sub_resource_idx, const D3D12_BOX *box) +{ + unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels; + struct d3d12_device *device = resource->device; + const struct vkd3d_format *vkd3d_format; + uint32_t width_mask, height_mask; + uint64_t width, height, depth; + + width = d3d12_resource_desc_get_width(&resource->desc, mip_level); + height = d3d12_resource_desc_get_height(&resource->desc, mip_level); + depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level); + + vkd3d_format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0); + assert(vkd3d_format); + width_mask = vkd3d_format->block_width - 1; + height_mask = vkd3d_format->block_height - 1; + + return box->left <= width && box->right <= width + && box->top <= height && box->bottom <= height + && box->front <= depth && box->back <= depth + && !(box->left & width_mask) + && !(box->right & width_mask) + && !(box->top & height_mask) + && !(box->bottom & height_mask); +} + /* ID3D12Resource */ static inline struct d3d12_resource *impl_from_ID3D12Resource(ID3D12Resource *iface) { @@ -1282,8 +1309,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour HRESULT hr; TRACE("iface %p, dst_data %p, dst_row_pitch %u, dst_slice_pitch %u, " - "src_sub_resource %u, src_box %p.\n", - iface, dst_data, dst_row_pitch, dst_slice_pitch, src_sub_resource, src_box); + "src_sub_resource %u, src_box %s.\n", + iface, dst_data, dst_row_pitch, dst_slice_pitch, src_sub_resource, debug_d3d12_box(src_box)); if (d3d12_resource_is_buffer(resource)) { @@ -1311,6 +1338,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour if (src_box) { + if (!d3d12_resource_validate_box(resource, src_sub_resource, src_box)) + { + WARN("Invalid box %s.\n", debug_d3d12_box(src_box)); + return E_INVALIDARG; + } + box = *src_box; } else @@ -1323,7 +1356,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); } if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + { + WARN("Empty box %s.\n", debug_d3d12_box(src_box)); return S_OK; + } if (!d3d12_resource_is_cpu_accessible(resource)) { diff --git a/tests/d3d12.c b/tests/d3d12.c index cc7113a..39cbc9e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30465,6 +30465,19 @@ static void test_read_write_subresource(void) goto done; } + /* Invalid box */ + set_box(&box, 0, 0, 0, 128, 100, 65); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + set_box(&box, 0, 0, 65, 128, 100, 65); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + set_box(&box, 128, 0, 0, 128, 100, 65); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -30474,6 +30487,10 @@ static void test_read_write_subresource(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Empty box */ + set_box(&box, 128, 100, 64, 128, 100, 64); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + set_box(&box, 0, 0, 0, 0, 0, 0); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -30625,7 +30642,51 @@ static void test_read_write_subresource(void) ID3D12Resource_Release(src_texture); ID3D12Resource_Release(dst_texture); - reset_command_list(command_list, context.allocator); + + /* Invalid box */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 64; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_BC1_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_CUSTOM; + heap_properties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties.MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&src_texture); + ok(hr == S_OK, "Failed to create resource, hr %#x.\n", hr); + + /* Unaligned coordinates for BC format */ + set_box(&box, 0, 0, 0, 2, 2, 1); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + set_box(&box, 2, 2, 0, 4, 4, 1); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + set_box(&box, 2, 2, 0, 6, 6, 1); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Invalid coordinates for resource dimensions */ + set_box(&box, 0, 0, 0, 64, 32, 2); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 68, 32, 1); + hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource_Release(src_texture); done: free(dst_buffer);

1 0

Józef Kucia : tests: Move invalid BC1_UNORM buffer view tests to d3d12_invalid_usage.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: vkd3d Branch: master Commit: 619bc19bdd90275e50a499f445440dfa5164955d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=619bc19bdd90275e50a499f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 7 15:58:27 2019 +0200 tests: Move invalid BC1_UNORM buffer view tests to d3d12_invalid_usage. Device is removed after CreateUnorderedAccessView(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 ---- tests/d3d12_invalid_usage.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 39cbc9e..9c608c1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2543,10 +2543,6 @@ static void test_create_unordered_access_view(void) cpu_handle.ptr += descriptor_size; - /* The following call fails. Buffer views cannot be created for compressed formats. */ - uav_desc.Format = DXGI_FORMAT_BC1_UNORM; - ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle); - /* DXGI_FORMAT_R32_UINT view for DXGI_FORMAT_R8G8B8A8_TYPELESS resources. */ texture = create_default_texture(device, 8, 8, DXGI_FORMAT_R8G8B8A8_TYPELESS, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index feb45b4..c6465d0 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -286,6 +286,44 @@ static void test_invalid_copy_texture_region(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_invalid_unordered_access_views(void) +{ + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + ID3D12DescriptorHeap *heap; + ID3D12Resource *buffer; + ID3D12Device *device; + ULONG refcount; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + + buffer = create_default_buffer(device, 64 * sizeof(float), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + + /* Buffer views cannot be created for compressed formats. */ + uav_desc.Format = DXGI_FORMAT_BC1_UNORM; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 64; + uav_desc.Buffer.StructureByteStride = 0; + uav_desc.Buffer.CounterOffsetInBytes = 0; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle); + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(buffer); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); @@ -294,4 +332,5 @@ START_TEST(d3d12_invalid_usage) run_test(test_invalid_resource_barriers); run_test(test_invalid_copy_texture_region); + run_test(test_invalid_unordered_access_views); }

1 0

Jeremy Newman : add WineConf news blurb
by Jeremy Newman 09 Aug '19

09 Aug '19

Module: website Branch: master Commit: bec52a773e2bab3573a4046e5c12395eeb1f5f22 URL: https://source.winehq.org/git/website.git/?a=commit;h=bec52a773e2bab3573a40… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 9 15:37:28 2019 -0500 add WineConf news blurb --- news/en/2019080901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2019080901.xml b/news/en/2019080901.xml new file mode 100644 index 0000000..a31e3e0 --- /dev/null +++ b/news/en/2019080901.xml @@ -0,0 +1,14 @@ +<news> +<date>August 9, 2019</date> +<title>WineConf 2019</title> +<body> +The Wine Project is pleased to announce that WineConf 2019 will +take place on October 12th - 13th 2019 in Toronto, Canada. +WineConf is the Wine Project's annual conference, where members of +the Wine community, the broader Free Software community and interested +users meet up over food and beverages. We traditionally also have a +number of talks by attendees, as well as some formal and informal +discussions about anything vaguely Wine related. +Please see the <a href="https://wiki.winehq.org/WineConf2019">WineConf2019 page</a> +for further details. +</body></news>

1 0

Alexandre Julliard : kernel32: Move more thread functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f2e7e1658beb48480bbe453bff43155eac2c40f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e7e1658beb48480bbe453b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 12:23:18 2019 +0200 kernel32: Move more thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +++--- dlls/kernel32/process.c | 153 ---------------------------------------- dlls/kernel32/thread.c | 74 ------------------- dlls/kernelbase/kernelbase.spec | 14 ++-- dlls/kernelbase/thread.c | 138 ++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2e7e1658beb48480bbe…

1 0

Alexandre Julliard : kernel32: Move some process functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 09f588ee6909369b541398dd392d3ff77231e6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f588ee6909369b541398dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 13:37:26 2019 +0200 kernel32: Move some process functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 8 - dlls/kernel32/kernel32.spec | 42 ++--- dlls/kernel32/process.c | 364 ---------------------------------------- dlls/kernel32/thread.c | 8 - dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 48 +++--- dlls/kernelbase/process.c | 346 ++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 8 files changed, 393 insertions(+), 425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f588ee6909369b5413…

1 0

Alexandre Julliard : kernel32: Move process/ thread attribute list functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: d8582d97a09b88d62f8d2b547538770f47f59dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8582d97a09b88d62f8d2b54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 13:44:17 2019 +0200 kernel32: Move process/thread attribute list functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/process.c | 137 -------------------------------------- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/process.c | 141 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8582d97a09b88d62f8d…

1 0