July 2018 - Wine-Commits - list.winehq.org

Józef Kucia : include: Add more alignment constants.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: a32648ade904e17e20c5950136c58f1a9064bb4b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a32648ade904e17e20c5950… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:15 2018 +0200 include: Add more alignment constants. 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> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a0c09ef..34e8697 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -53,9 +53,15 @@ const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; +const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; +const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; const UINT D3D12_TEXTURE_DATA_PITCH_ALIGNMENT = 256; const UINT D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT = 512; +const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16;

1 0

Józef Kucia : libs/vkd3d: Implement d3d12_device_CreateHeap().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: d9d37d15632e1e4f63e54e1ec48e88ef356b8aab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9d37d15632e1e4f63e54e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:18 2018 +0200 libs/vkd3d: Implement d3d12_device_CreateHeap(). 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/device.c | 15 +++- libs/vkd3d/resource.c | 204 +++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 16 +++- 3 files changed, 230 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 176b0d4..6fa0017 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1853,12 +1853,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, - const D3D12_HEAP_DESC *desc, REFIID riid, void **heap) + const D3D12_HEAP_DESC *desc, REFIID iid, void **heap) { - FIXME("iface %p, desc %p, riid %s, heap %p stub!\n", - iface, desc, debugstr_guid(riid), heap); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_heap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, iid %s, heap %p.\n", + iface, desc, debugstr_guid(iid), heap); + + if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + return hr; + + return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9fa98b0..1456c4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,6 +18,210 @@ #include "vkd3d_private.h" +/* ID3D12Heap */ +static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_heap, ID3D12Heap_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_QueryInterface(ID3D12Heap *iface, + REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_ID3D12Heap) + || IsEqualGUID(iid, &IID_ID3D12Pageable) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3D12Heap_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedIncrement(&heap->refcount); + + TRACE("%p increasing refcount to %u.\n", heap, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedDecrement(&heap->refcount); + + TRACE("%p decreasing refcount to %u.\n", heap, refcount); + + if (!refcount) + { + struct d3d12_device *device = heap->device; + + vkd3d_free(heap); + + ID3D12Device_Release(&device->ID3D12Device_iface); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, + REFIID riid, void **device) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, riid, device); +} + +static D3D12_HEAP_DESC * STDMETHODCALLTYPE d3d12_heap_GetDesc(ID3D12Heap *iface, + D3D12_HEAP_DESC *desc) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = heap->desc; + return desc; +} + +static const struct ID3D12HeapVtbl d3d12_heap_vtbl = +{ + /* IUnknown methods */ + d3d12_heap_QueryInterface, + d3d12_heap_AddRef, + d3d12_heap_Release, + /* ID3D12Object methods */ + d3d12_heap_GetPrivateData, + d3d12_heap_SetPrivateData, + d3d12_heap_SetPrivateDataInterface, + d3d12_heap_SetName, + /* ID3D12DeviceChild methods */ + d3d12_heap_GetDevice, + /* ID3D12Heap methods */ + d3d12_heap_GetDesc, +}; + +static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) +{ + if (!desc->SizeInBytes) + { + WARN("Invalid size %"PRIu64".\n", desc->SizeInBytes); + return E_INVALIDARG; + } + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid alignment %"PRIu64".\n", desc->Alignment); + return E_INVALIDARG; + } + + if (desc->Flags & D3D12_HEAP_FLAG_ALLOW_DISPLAY) + { + WARN("D3D12_HEAP_FLAG_ALLOW_DISPLAY is only for committed resources.\n"); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT d3d12_heap_init(struct d3d12_heap *heap, + struct d3d12_device *device, const D3D12_HEAP_DESC *desc) +{ + HRESULT hr; + + heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; + heap->refcount = 1; + + heap->desc = *desc; + + if (!heap->desc.Properties.CreationNodeMask) + heap->desc.Properties.CreationNodeMask = 1; + if (!heap->desc.Properties.VisibleNodeMask) + heap->desc.Properties.VisibleNodeMask = 1; + + debug_ignored_node_mask(heap->desc.Properties.CreationNodeMask); + debug_ignored_node_mask(heap->desc.Properties.VisibleNodeMask); + + if (!heap->desc.Alignment) + heap->desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + if (FAILED(hr = validate_heap_desc(&heap->desc))) + return hr; + + heap->device = device; + ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; +} + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) +{ + struct d3d12_heap *object; + HRESULT hr; + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + + TRACE("Created heap %p.\n", object); + + *heap = object; + + return S_OK; +} + static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DIMENSION dimension) { switch (dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0adc2e4..8efb930 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -180,6 +180,20 @@ struct d3d12_fence HRESULT d3d12_fence_create(struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; +/* ID3D12Heap */ +struct d3d12_heap +{ + ID3D12Heap ID3D12Heap_iface; + LONG refcount; + + D3D12_HEAP_DESC desc; + + struct d3d12_device *device; +}; + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) DECLSPEC_HIDDEN; + #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 @@ -766,7 +780,7 @@ bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDE bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *properties) +static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) { if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) return false;

1 0

Józef Kucia : include: Add ID3D12Heap.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: add556f0eecc8e7e42c54ecba73375d0ea448974 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=add556f0eecc8e7e42c54ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:16 2018 +0200 include: Add ID3D12Heap. 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> --- include/vkd3d_d3d12.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 34e8697..4b967d4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1606,6 +1606,17 @@ interface ID3D12Pageable : ID3D12DeviceChild } [ + uuid(6b3b2502-6e51-45b3-90ee-9884265e8df3), + object, + local, + pointer_default(unique) +] +interface ID3D12Heap : ID3D12Pageable +{ + D3D12_HEAP_DESC GetDesc(); +} + +[ uuid(696442be-a72e-4059-bc79-5b5c98040fad), object, local,

1 0

Józef Kucia : libs/vkd3d: Factor out debug_ignored_node_mask().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: cc47b37c1d1f511eb1983795bef0c2cb32521fd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc47b37c1d1f511eb198379… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:17 2018 +0200 libs/vkd3d: Factor out debug_ignored_node_mask(). 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/command.c | 3 +-- libs/vkd3d/device.c | 7 +++++-- libs/vkd3d/vkd3d_private.h | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d29d18e..4db9967 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4045,8 +4045,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device, return E_INVALIDARG; } - if (node_mask && node_mask != 1) - FIXME("Multi-adapter not supported.\n"); + debug_ignored_node_mask(node_mask); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5d2c91f..176b0d4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1663,8 +1663,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device * TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n", iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature); - if (node_mask && node_mask != 1) - FIXME("Ignoring node mask 0x%08x.\n", node_mask); + debug_ignored_node_mask(node_mask); if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object))) return hr; @@ -1816,6 +1815,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour "resource_descs %p stub!\n", iface, allocation_info, visible_mask, resource_desc_count, resource_descs); + debug_ignored_node_mask(visible_mask); + return allocation_info; } @@ -1825,6 +1826,8 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", iface, heap_properties, node_mask, heap_type); + debug_ignored_node_mask(node_mask); + return heap_properties; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e9ee06a..0adc2e4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -786,6 +786,12 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +static inline void debug_ignored_node_mask(unsigned int mask) +{ + if (mask && mask != 1) + FIXME("Ignoring node mask 0x%08x.\n", mask); +} + HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;

1 0

Józef Kucia : tests: Add more tests for D3D12CreateDevice() with device set to NULL.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: 21f1489b8879da12d3dd53b5514324b7fbe8dcc2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21f1489b8879da12d3dd53b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:13 2018 +0200 tests: Add more tests for D3D12CreateDevice() with device set to NULL. 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 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e2337c4..83dc8f9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1082,6 +1082,10 @@ static void test_create_device(void) hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12DeviceChild, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : libs/vkd3d: Introduce d3d12_resource_validate_desc().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: a5a17c22f1bbc56074e5adc3e5272d6f33640a1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5a17c22f1bbc56074e5adc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:14 2018 +0200 libs/vkd3d: Introduce d3d12_resource_validate_desc(). Share D3D12_RESOURCE_DESC validation code between CreateCommittedResource() and GetCopyableFootprints(). 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/device.c | 34 +++++------------------------ libs/vkd3d/resource.c | 53 +++++++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index aaa4746..5d2c91f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1964,7 +1964,8 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { - static const struct vkd3d_format vkd3d_format_unknown = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; + static const struct vkd3d_format vkd3d_format_unknown + = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; @@ -1995,35 +1996,10 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - /* FIXME: We should probably share D3D12_RESOURCE_DESC validation with CreateCommittedResource(). */ - switch (desc->Dimension) + if (FAILED(d3d12_resource_validate_desc(desc))) { - case D3D12_RESOURCE_DIMENSION_BUFFER: - if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR - || desc->Height != 1 || desc->DepthOrArraySize != 1 || desc->MipLevels != 1 - || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 - || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) - { - WARN("Invalid parameters for a buffer resource.\n"); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE1D: - if (desc->Height != 1) - { - WARN("1D texture with a height of %u.\n", desc->Height); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE2D: - case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - break; - - default: - WARN("Invalid resource dimension %#x.\n", desc->Dimension); - return; + WARN("Invalid resource desc.\n"); + return; } array_size = d3d12_resource_desc_get_layer_count(desc); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fb84e4b..9fa98b0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -648,21 +648,43 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } -static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) { - if (desc->MipLevels != 1) + switch (desc->Dimension) { - WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); - return E_INVALIDARG; - } + case D3D12_RESOURCE_DIMENSION_BUFFER: + if (desc->MipLevels != 1) + { + WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); + return E_INVALIDARG; + } - return S_OK; -} + if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR + || desc->Height != 1 || desc->DepthOrArraySize != 1 + || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 + || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid parameters for a buffer resource.\n"); + return E_INVALIDARG; + } + break; -static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) -{ - if (!desc->MipLevels) - desc->MipLevels = max_miplevel_count(desc); + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + if (desc->Height != 1) + { + WARN("1D texture with a height of %u.\n", desc->Height); + return E_INVALIDARG; + } + break; + + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + break; + + default: + WARN("Invalid resource dimension %#x.\n", desc->Dimension); + return E_INVALIDARG; + } return S_OK; } @@ -717,11 +739,12 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->gpu_address = 0; resource->flags = 0; + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + return hr; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: - if (FAILED(hr = validate_buffer_desc(&resource->desc))) - return hr; if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -743,8 +766,8 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - if (FAILED(hr = validate_texture_desc(&resource->desc))) - return hr; + if (!resource->desc.MipLevels) + resource->desc.MipLevels = max_miplevel_count(desc); resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2c22467..e9ee06a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -223,6 +223,8 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; + 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,

1 0

Francois Gouget : testbot/WineSendLog: Show the task command in the summary.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: f7a65d3a5f348681fa302335b83fdc587cb1830e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7a65d3a5f348681fa30233… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:02:39 2018 +0200 testbot/WineSendLog: Show the task command in the summary. Otherwise when a job involves running many test units, possibly from multiple modules, it's hard to know which ones succeeded and which ones failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 537778a..368d830 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,7 +258,7 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Failures Command EOF foreach my $Key (@SortedKeys) { @@ -268,9 +268,12 @@ EOF $TestFailures = "" if (!defined $TestFailures); my $Status = $StepTask->Status; $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + my $Cmd = ""; + $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); + $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); - printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, - $TestFailures; + printf $Sendmail "%-20s %-8s %-8s %s\n", $StepTask->VM->Name, $Status, + $TestFailures, $Cmd; } print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n";

1 0

Francois Gouget : testbot/WineSendLog: Replace completed with a more explicit status.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: 093141f912eebdf622eedd2d74390fa06644f657 URL: https://source.winehq.org/git/tools.git/?a=commit;h=093141f912eebdf622eedd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:02:15 2018 +0200 testbot/WineSendLog: Replace completed with a more explicit status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8885e20..537778a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,17 +258,18 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Number of test failures EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TestFailures = $StepTask->TestFailures; - if (! defined($TestFailures)) - { - $TestFailures = ""; - } - printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status; + $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + + printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, $TestFailures; }

1 0

Francois Gouget : testbot/WineSendLog: Sort the tasks in numeric order.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: 204af99a5cb7ee319448d0ca2965c73cf5af2352 URL: https://source.winehq.org/git/tools.git/?a=commit;h=204af99a5cb7ee319448d0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:01:34 2018 +0200 testbot/WineSendLog: Sort the tasks in numeric order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e2c823a..8885e20 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -214,7 +214,7 @@ sub SendLog($) } my $StepsTasks = CreateStepsTasks(undef, $Job); - my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; my $JobURL = ($UseSSL ? "https://" : "http://") . "$WebHostName/JobDetails.pl?Key=". $Job->GetKey();

1 0

Piotr Caban : msvcp90: Don't set failbit in basic_istream::tellg.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 98bc9fdaa431f274fe3a9fc538b0b562c6fad981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98bc9fdaa431f274fe3a9fc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 19 17:59:55 2018 +0200 msvcp90: Don't set failbit in basic_istream::tellg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42304 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 11 ----------- dlls/msvcp90/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f85997..fb9d668 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8823,9 +8823,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -8842,9 +8839,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); #endif return ret; @@ -10398,9 +10392,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -10417,8 +10408,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); #endif return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 8a91117..970b17a 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1857,6 +1857,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1884,6 +1888,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);

1 0