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

vkd3d question
by Fabian Maurer Jan. 26, 2019

Jan. 26, 2019

Hello wine-devel, I'm curious as to why you decided to put vkd3d into a separate repo instead of the main wine repo. After all and AFAIK, it's the first dlls to get such a special treatment. How comes? I was wondering for a while now, and I've probably just missed it, mind giving me a short explanation or link to one? Regards, Fabian Maurer

4 4

[PATCH vkd3d 5/5] vkd3d: Implement set name for pipeline states.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 7 +++++-- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3c..09f7989 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1139,6 +1139,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState struct d3d12_device *device = state->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + if (state->name) vkd3d_free(state->name); vkd3d_private_store_destroy(&state->private_store); if (d3d12_pipeline_state_is_graphics(state)) @@ -1195,9 +1196,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, state->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_name(&state->name, name, state->device->wchar_size); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, @@ -1446,6 +1447,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl; state->refcount = 1; + state->name = NULL; state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; @@ -1993,6 +1995,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl; state->refcount = 1; + state->name = NULL; state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6607634..f913f49 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -644,6 +644,7 @@ struct d3d12_pipeline_state { ID3D12PipelineState ID3D12PipelineState_iface; LONG refcount; + WCHAR *name; union { -- 2.19.2

1 0

[PATCH vkd3d 4/5] vkd3d: Implement set name for heaps.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++-- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3f8e05e..5e47a80 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -144,6 +144,7 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + if (heap->name) vkd3d_free(heap->name); vkd3d_private_store_destroy(&heap->private_store); VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); @@ -191,10 +192,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap * static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + hr = vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name); + if (FAILED(hr)) return hr; + + return vkd3d_set_name(&heap->name, name, heap->device->wchar_size); } static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, @@ -349,6 +355,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; heap->refcount = 1; + heap->name = NULL; heap->desc = *desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fbabc39..6607634 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -263,6 +263,7 @@ struct d3d12_heap { ID3D12Heap ID3D12Heap_iface; LONG refcount; + WCHAR *name; D3D12_HEAP_DESC desc; -- 2.19.2

1 0

[PATCH vkd3d 3/5] vkd3d: Implement set name for resources.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/resource.c | 23 +++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7afcaea..3f8e05e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -736,6 +736,7 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) if (!refcount) { + if (resource->name) vkd3d_free(resource->name); vkd3d_private_store_destroy(&resource->private_store); d3d12_resource_destroy(resource, resource->device); vkd3d_free(resource); @@ -842,10 +843,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateDataInterface(ID3D12Re static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, const WCHAR *name) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, resource->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, resource->device->wchar_size)); - return E_NOTIMPL; + if (resource->vk_memory) + { + hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->vk_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name); + if (FAILED(hr)) return hr; + } + + if (d3d12_resource_is_buffer(resource)) + hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, name); + else + hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_image, + VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, name); + + if (FAILED(hr)) return hr; + + return vkd3d_set_name(&resource->name, name, resource->device->wchar_size); } static HRESULT STDMETHODCALLTYPE d3d12_resource_GetDevice(ID3D12Resource *iface, @@ -1118,6 +1136,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; resource->refcount = 1; resource->internal_refcount = 1; + resource->name = NULL; resource->desc = *desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eb4d794..fbabc39 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -292,6 +292,7 @@ struct d3d12_resource ID3D12Resource ID3D12Resource_iface; LONG refcount; LONG internal_refcount; + WCHAR *name; D3D12_RESOURCE_DESC desc; -- 2.19.2

1 0

[PATCH vkd3d 2/5] vkd3d: Implement set name for descriptor heaps.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++-- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4ebfe30..7afcaea 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2416,6 +2416,7 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea struct d3d12_device *device = heap->device; unsigned int i; + if (heap->name) vkd3d_free(heap->name); vkd3d_private_store_destroy(&heap->private_store); switch (heap->desc.Type) @@ -2500,9 +2501,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorH { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_name(&heap->name, name, heap->device->wchar_size); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, @@ -2576,6 +2577,7 @@ static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descript descriptor_heap->ID3D12DescriptorHeap_iface.lpVtbl = &d3d12_descriptor_heap_vtbl; descriptor_heap->refcount = 1; + descriptor_heap->name = NULL; descriptor_heap->desc = *desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 80e909d..eb4d794 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -465,6 +465,7 @@ struct d3d12_descriptor_heap { ID3D12DescriptorHeap ID3D12DescriptorHeap_iface; LONG refcount; + WCHAR *name; D3D12_DESCRIPTOR_HEAP_DESC desc; -- 2.19.2

1 0

[PATCH vkd3d 1/5] vkd3d: Implement set name for query heaps.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Makefile.am | 5 +- include/private/vkd3d_string.h | 57 ++++++++ include/private/vkd3d_utf8.h | 8 ++ libs/vkd3d-common/utf8.c | 248 +++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 11 +- libs/vkd3d/utils.c | 61 ++++++++ libs/vkd3d/vkd3d_private.h | 8 ++ libs/vkd3d/vulkan_procs.h | 2 + 9 files changed, 398 insertions(+), 3 deletions(-) create mode 100644 include/private/vkd3d_string.h create mode 100644 include/private/vkd3d_utf8.h create mode 100644 libs/vkd3d-common/utf8.c diff --git a/Makefile.am b/Makefile.am index 7869b2e..abba599 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,8 @@ noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ libs/vkd3d-common/debug.c \ - libs/vkd3d-common/memory.c + libs/vkd3d-common/memory.c \ + libs/vkd3d-common/utf8.c lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la @@ -88,6 +89,8 @@ libvkd3d_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ + include/private/vkd3d_string.h \ + include/private/vkd3d_utf8.h \ include/private/vkd3d_test.h \ include/vkd3d_d3d12.idl \ include/vkd3d_d3dcommon.idl \ diff --git a/include/private/vkd3d_string.h b/include/private/vkd3d_string.h new file mode 100644 index 0000000..07adc98 --- /dev/null +++ b/include/private/vkd3d_string.h @@ -0,0 +1,57 @@ +/* + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_STRING_H +#define __VKD3D_STRING_H + +#include "vkd3d_memory.h" + +#include <inttypes.h> + +static inline size_t vkd3d_strlen_w16(const uint16_t *wstr) +{ + const uint16_t *s = wstr; + while (*s) s++; + return s - wstr; +} + +static inline size_t vkd3d_strlen_w32(const uint32_t *wstr) +{ + const uint32_t *s = wstr; + while (*s) s++; + return s - wstr; +} + +static inline WCHAR *vkd3d_strdup_w(const WCHAR *src, size_t wchar_size) +{ + size_t size; + WCHAR *dst; + + if (wchar_size == 2) + size = (vkd3d_strlen_w16((const uint16_t *)src) + 1) * wchar_size; + else + size = (vkd3d_strlen_w32((const uint32_t *)src) + 1) * wchar_size; + + if (!(dst = vkd3d_malloc(size))) + return NULL; + + memcpy(dst, src, size); + return dst; +} + +#endif /* __VKD3D_STRING_H */ \ No newline at end of file diff --git a/include/private/vkd3d_utf8.h b/include/private/vkd3d_utf8.h new file mode 100644 index 0000000..c7f1a07 --- /dev/null +++ b/include/private/vkd3d_utf8.h @@ -0,0 +1,8 @@ +#include "vkd3d_common.h" + +#include <inttypes.h> + +#define WC_ERR_INVALID_CHARS 0x0080 + +int wine_utf8_wcstombs_w16(int flags, const uint16_t *src, int srclen, char *dst, int dstlen) DECLSPEC_HIDDEN; +int wine_utf8_wcstombs_w32(int flags, const uint32_t *src, int srclen, char *dst, int dstlen) DECLSPEC_HIDDEN; \ No newline at end of file diff --git a/libs/vkd3d-common/utf8.c b/libs/vkd3d-common/utf8.c new file mode 100644 index 0000000..da3e682 --- /dev/null +++ b/libs/vkd3d-common/utf8.c @@ -0,0 +1,248 @@ +/* + * UTF-8 support routines + * + * Copyright 2000 Alexandre Julliard + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_utf8.h" + +/* get the next char value taking surrogates into account */ +static inline unsigned int get_surrogate_value_w16( const uint16_t *src, unsigned int srclen ) +{ + if (src[0] >= 0xd800 && src[0] <= 0xdfff) /* surrogate pair */ + { + if (src[0] > 0xdbff || /* invalid high surrogate */ + srclen <= 1 || /* missing low surrogate */ + src[1] < 0xdc00 || src[1] > 0xdfff) /* invalid low surrogate */ + return 0; + return 0x10000 + ((src[0] & 0x3ff) << 10) + (src[1] & 0x3ff); + } + return src[0]; +} + +/* query necessary dst length for src string */ +static inline int get_length_wcs_utf8_w16( int flags, const uint16_t *src, unsigned int srclen ) +{ + int len; + unsigned int val; + + for (len = 0; srclen; srclen--, src++) + { + if (*src < 0x80) /* 0x00-0x7f: 1 byte */ + { + len++; + continue; + } + if (*src < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + len += 2; + continue; + } + if (!(val = get_surrogate_value_w16( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; + } + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + len += 3; + else /* 0x10000-0x10ffff: 4 bytes */ + { + len += 4; + src++; + srclen--; + } + } + return len; +} + +/* wide char to UTF-8 string conversion */ +/* return -1 on dst buffer overflow, -2 on invalid input char */ +int wine_utf8_wcstombs_w16( int flags, const uint16_t *src, int srclen, char *dst, int dstlen ) +{ + int len; + + if (!dstlen) return get_length_wcs_utf8_w16( flags, src, srclen ); + + for (len = dstlen; srclen; srclen--, src++) + { + uint16_t ch = *src; + unsigned int val; + + if (ch < 0x80) /* 0x00-0x7f: 1 byte */ + { + if (!len--) return -1; /* overflow */ + *dst++ = ch; + continue; + } + + if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + if ((len -= 2) < 0) return -1; /* overflow */ + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xc0 | ch; + dst += 2; + continue; + } + + if (!(val = get_surrogate_value_w16( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; + } + + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + { + if ((len -= 3) < 0) return -1; /* overflow */ + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xe0 | val; + dst += 3; + } + else /* 0x10000-0x10ffff: 4 bytes */ + { + if ((len -= 4) < 0) return -1; /* overflow */ + dst[3] = 0x80 | (val & 0x3f); + val >>= 6; + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xf0 | val; + dst += 4; + src++; + srclen--; + } + } + return dstlen - len; +} + +/* get the next char value taking surrogates into account */ +static inline unsigned int get_surrogate_value_w32( const uint32_t *src, unsigned int srclen ) +{ + if (src[0] >= 0xd800 && src[0] <= 0xdfff) /* surrogate pair */ + { + if (src[0] > 0xdbff || /* invalid high surrogate */ + srclen <= 1 || /* missing low surrogate */ + src[1] < 0xdc00 || src[1] > 0xdfff) /* invalid low surrogate */ + return 0; + return 0x10000 + ((src[0] & 0x3ff) << 10) + (src[1] & 0x3ff); + } + return src[0]; +} + +/* query necessary dst length for src string */ +static inline int get_length_wcs_utf8_w32( int flags, const uint32_t *src, unsigned int srclen ) +{ + int len; + unsigned int val; + + for (len = 0; srclen; srclen--, src++) + { + if (*src < 0x80) /* 0x00-0x7f: 1 byte */ + { + len++; + continue; + } + if (*src < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + len += 2; + continue; + } + if (!(val = get_surrogate_value_w32( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; + } + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + len += 3; + else /* 0x10000-0x10ffff: 4 bytes */ + { + len += 4; + src++; + srclen--; + } + } + return len; +} + +/* wide char to UTF-8 string conversion */ +/* return -1 on dst buffer overflow, -2 on invalid input char */ +int wine_utf8_wcstombs_w32( int flags, const uint32_t *src, int srclen, char *dst, int dstlen ) +{ + int len; + + if (!dstlen) return get_length_wcs_utf8_w32( flags, src, srclen ); + + for (len = dstlen; srclen; srclen--, src++) + { + uint32_t ch = *src; + unsigned int val; + + if (ch < 0x80) /* 0x00-0x7f: 1 byte */ + { + if (!len--) return -1; /* overflow */ + *dst++ = ch; + continue; + } + + if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + if ((len -= 2) < 0) return -1; /* overflow */ + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xc0 | ch; + dst += 2; + continue; + } + + if (!(val = get_surrogate_value_w32( src, srclen ))) + { + if (flags & WC_ERR_INVALID_CHARS) return -2; + continue; + } + + if (val < 0x10000) /* 0x800-0xffff: 3 bytes */ + { + if ((len -= 3) < 0) return -1; /* overflow */ + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xe0 | val; + dst += 3; + } + else /* 0x10000-0x10ffff: 4 bytes */ + { + if ((len -= 4) < 0) return -1; /* overflow */ + dst[3] = 0x80 | (val & 0x3f); + val >>= 6; + dst[2] = 0x80 | (val & 0x3f); + val >>= 6; + dst[1] = 0x80 | (val & 0x3f); + val >>= 6; + dst[0] = 0xf0 | val; + dst += 4; + src++; + srclen--; + } + } + return dstlen - len; +} \ No newline at end of file diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 64c8391..ff0c8c1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -83,6 +83,7 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { + {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6eba450..4ebfe30 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2684,6 +2684,7 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + if (heap->name) vkd3d_free(heap->name); vkd3d_private_store_destroy(&heap->private_store); VK_CALL(vkDestroyQueryPool(device->vk_device, heap->vk_query_pool, NULL)); @@ -2729,10 +2730,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetPrivateDataInterface(ID3D12 static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface, const WCHAR *name) { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + hr = vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_query_pool, + VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT, name); + if (FAILED(hr)) return hr; + + return vkd3d_set_name(&heap->name, name, heap->device->wchar_size); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetDevice(ID3D12QueryHeap *iface, @@ -2784,6 +2790,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H object->ID3D12QueryHeap_iface.lpVtbl = &d3d12_query_heap_vtbl; object->refcount = 1; + object->name = NULL; object->device = device; memset(object->availability_mask, 0, element_count * sizeof(*object->availability_mask)); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 0144fdc..10ed88f 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -642,3 +642,64 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, pthread_mutex_unlock(&store->mutex); return hr; } + +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkDebugMarkerObjectNameInfoEXT info = {0}; + char *buffer; + int length; + int size; + VkResult vr; + + if (!name) + return E_INVALIDARG; + + if (!device->vk_info.EXT_debug_marker) + return S_OK; + + if (device->wchar_size == 2) + { + length = vkd3d_strlen_w16((const uint16_t *)name); + size = wine_utf8_wcstombs_w16(0, (const uint16_t *)name, length + 1, NULL, 0); + } + else + { + length = vkd3d_strlen_w32((const uint32_t *)name); + size = wine_utf8_wcstombs_w32(0, (const uint32_t *)name, length + 1, NULL, 0); + } + + if (!(buffer = vkd3d_malloc(size))) + return E_OUTOFMEMORY; + + if (device->wchar_size == 2) + wine_utf8_wcstombs_w16(0, (const uint16_t *)name, length + 1, buffer, size); + else + wine_utf8_wcstombs_w32(0, (const uint32_t *)name, length + 1, buffer, size); + + info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; + info.objectType = vk_object_type; + info.object = vk_object; + info.pObjectName = buffer; + vr = VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); + + vkd3d_free(buffer); + return vr == VK_SUCCESS ? S_OK : E_OUTOFMEMORY; +} + +HRESULT vkd3d_set_name(WCHAR **dst, const WCHAR *src, size_t wchar_size) +{ + if (!src) + return E_INVALIDARG; + + if (*dst) + vkd3d_free(*dst); + + *dst = vkd3d_strdup_w(src, wchar_size); + + if (!*dst) + return E_OUTOFMEMORY; + + return S_OK; +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 73825bb..80e909d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -25,6 +25,8 @@ #include "vkd3d_common.h" #include "vkd3d_memory.h" +#include "vkd3d_string.h" +#include "vkd3d_utf8.h" #include "list.h" #include "rbtree.h" @@ -86,6 +88,7 @@ struct vkd3d_vulkan_info bool KHR_get_physical_device_properties2; bool EXT_debug_report; /* device extensions */ + bool EXT_debug_marker; bool KHR_push_descriptor; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; @@ -480,6 +483,7 @@ struct d3d12_query_heap { ID3D12QueryHeap ID3D12QueryHeap_iface; LONG refcount; + WCHAR *name; VkQueryPool vk_query_pool; @@ -1026,4 +1030,8 @@ static inline void vkd3d_set_thread_name(const char *name) #endif } +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; +HRESULT vkd3d_set_name(WCHAR **dst, const WCHAR *src, size_t wchar_size) DECLSPEC_HIDDEN; + #endif /* __VKD3D_PRIVATE_H */ diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index be983ec..b62af4e 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -174,6 +174,8 @@ VK_DEVICE_PFN(vkSetEvent) VK_DEVICE_PFN(vkUnmapMemory) VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) +/* VK_EXT_debug_marker */ +VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) /* VK_EXT_transform_feedback */ -- 2.19.2

1 0

[PATCH v2] msacm32: Reference count local drivers.
by Zhiyi Zhang Jan. 26, 2019

Jan. 26, 2019

One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46520 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Add Wine-Bug tag. dlls/msacm32/internal.c | 12 +++++++++++- dlls/msacm32/wineacm.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aad071e8ad..7d324a8b27 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) { PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + LONG ref; if (paldrv->pACMInstList) { ERR("local driver instances still present after closing all drivers - memory leak\n"); return NULL; } + ref = InterlockedDecrement(&paldrv->ref); + if (ref) + return paldrv; + if (paldrv == MSACM_pFirstACMLocalDriver) MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; if (paldrv == MSACM_pLastACMLocalDriver) @@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri /* look up previous instance of local driver module */ for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv) { - if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv; + if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) + { + InterlockedIncrement(&paldrv->ref); + return paldrv; + } } paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER)); @@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri paldrv->hModule = hModule; paldrv->lpDrvProc = lpDriverProc; paldrv->pACMInstList = NULL; + paldrv->ref = 1; paldrv->pNextACMLocalDrv = NULL; paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 406e01bf21..98d1ab5a2c 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER PWINE_ACMLOCALDRIVERINST pACMInstList; PWINE_ACMLOCALDRIVER pNextACMLocalDrv; PWINE_ACMLOCALDRIVER pPrevACMLocalDrv; + LONG ref; } WINE_ACMLOCALDRIVER; typedef struct _WINE_ACMLOCALDRIVERINST -- 2.19.2

1 0

[PATCH] dbghelp: Support full memory dumps.
by Eric Bissonnette Jan. 25, 2019

Jan. 25, 2019

Add support of flag MinidumpWithFullMemory in function MinidumpWriteDump. A Memory64ListStream is added to the minidump streams and all memory regions of the process with MEM_COMMIT state are written to the last part of the minidump file. Signed-off-by: Eric Bissonnette <ebisso.dev(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 9 +++ dlls/dbghelp/minidump.c | 129 ++++++++++++++++++++++++++++++++++++++--- include/dbghelp.h | 13 +++++ 3 files changed, 144 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ae8bc50..8083408 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -471,6 +471,12 @@ struct dump_memory ULONG rva; }; +struct dump_memory64 +{ + ULONG64 base; + ULONG64 size; +}; + struct dump_module { unsigned is_elf; @@ -509,6 +515,9 @@ struct dump_context struct dump_memory* mem; unsigned num_mem; unsigned alloc_mem; + struct dump_memory64* mem64; + unsigned num_mem64; + unsigned alloc_mem64; /* callback information */ MINIDUMP_CALLBACK_INFORMATION* cb; }; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 04dc775..ad69ba5 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,6 +294,49 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } +void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +{ + if (!dc->mem64) + { + dc->alloc_mem64 = 32; + dc->mem64 = HeapAlloc(GetProcessHeap(), 0, dc->alloc_mem64 * sizeof(*dc->mem64)); + } + else if (dc->num_mem64 >= dc->alloc_mem64) + { + dc->alloc_mem64 *= 2; + dc->mem64 = HeapReAlloc(GetProcessHeap(), 0, dc->mem64, + dc->alloc_mem64 * sizeof(*dc->mem64)); + } + if (dc->mem64) + { + dc->mem64[dc->num_mem64].base = base; + dc->mem64[dc->num_mem64].size = size; + dc->num_mem64++; + } + else dc->num_mem64 = dc->alloc_mem64 = 0; +} + +static void fetch_memory64_info(struct dump_context* dc) +{ + ULONG_PTR addr; + MEMORY_BASIC_INFORMATION mbi; + + addr = 0; + while (VirtualQueryEx(dc->hProcess, (LPCVOID)addr, &mbi, sizeof(mbi)) != 0) + { + /* Memory regions with state MEM_COMMIT will be added to the dump */ + if (mbi.State == MEM_COMMIT) + { + minidump_add_memory64_block(dc, (ULONG_PTR)mbi.BaseAddress, mbi.RegionSize); + } + + if ((addr + mbi.RegionSize) < addr) + break; + + addr = (ULONG_PTR)mbi.BaseAddress + mbi.RegionSize; + } +} + static void fetch_modules_info(struct dump_context* dc) { EnumerateLoadedModulesW64(dc->hProcess, fetch_pe_module_info_cb, dc); @@ -831,6 +874,60 @@ static unsigned dump_memory_info(struct dump_context* dc) return sz; } +/****************************************************************** + * dump_memory64_info + * + * dumps information about the memory of the process (virtual memory) + */ +static unsigned dump_memory64_info(struct dump_context* dc) +{ + MINIDUMP_MEMORY64_LIST mdMem64List; + MINIDUMP_MEMORY_DESCRIPTOR64 mdMem64; + DWORD written; + unsigned i, len, sz; + RVA rva_base; + char tmp[1024]; + ULONG64 pos; + LARGE_INTEGER filepos; + + sz = sizeof(mdMem64List.NumberOfMemoryRanges) + + sizeof(mdMem64List.BaseRva) + + dc->num_mem64 * sizeof(mdMem64); + + mdMem64List.NumberOfMemoryRanges = dc->num_mem64; + mdMem64List.BaseRva = dc->rva + sz; + + append(dc, &mdMem64List.NumberOfMemoryRanges, + sizeof(mdMem64List.NumberOfMemoryRanges)); + append(dc, &mdMem64List.BaseRva, + sizeof(mdMem64List.BaseRva)); + + rva_base = dc->rva; + dc->rva += dc->num_mem64 * sizeof(mdMem64); + + /* dc->rva is not updated past this point. The end of the dump + * is just the full memory data. */ + filepos.QuadPart = dc->rva; + for (i = 0; i < dc->num_mem64; i++) + { + mdMem64.StartOfMemoryRange = dc->mem64[i].base; + mdMem64.DataSize = dc->mem64[i].size; + SetFilePointerEx(dc->hFile, filepos, NULL, FILE_BEGIN); + for (pos = 0; pos < dc->mem64[i].size; pos += sizeof(tmp)) + { + len = min(dc->mem64[i].size - pos, sizeof(tmp)); + if (ReadProcessMemory(dc->hProcess, + (void*)(ULONG_PTR)(dc->mem64[i].base + pos), + tmp, len, NULL)) + WriteFile(dc->hFile, tmp, len, &written, NULL); + } + filepos.QuadPart += mdMem64.DataSize; + writeat(dc, rva_base + i * sizeof(mdMem64), &mdMem64, sizeof(mdMem64)); + } + + return sz; +} + static unsigned dump_misc_info(struct dump_context* dc) { MINIDUMP_MISC_INFO mmi; @@ -876,6 +973,9 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, dc.mem = NULL; dc.num_mem = 0; dc.alloc_mem = 0; + dc.mem64 = NULL; + dc.num_mem64 = 0; + dc.alloc_mem64 = 0; dc.rva = 0; if (!fetch_process_info(&dc)) return FALSE; @@ -890,8 +990,6 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, if (DumpType & MiniDumpWithDataSegs) FIXME("NIY MiniDumpWithDataSegs\n"); - if (DumpType & MiniDumpWithFullMemory) - FIXME("NIY MiniDumpWithFullMemory\n"); if (DumpType & MiniDumpWithHandleData) FIXME("NIY MiniDumpWithHandleData\n"); if (DumpType & MiniDumpFilterMemory) @@ -940,11 +1038,15 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); - mdDir.StreamType = MemoryListStream; - mdDir.Location.Rva = dc.rva; - mdDir.Location.DataSize = dump_memory_info(&dc); - writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), - &mdDir, sizeof(mdDir)); + + if (!(DumpType & MiniDumpWithFullMemory)) + { + mdDir.StreamType = MemoryListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; @@ -977,12 +1079,25 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, } } + /* 3.4) write full memory (if requested) */ + if (DumpType & MiniDumpWithFullMemory) + { + fetch_memory64_info(&dc); + + mdDir.StreamType = Memory64ListStream; + mdDir.Location.Rva = dc.rva; + mdDir.Location.DataSize = dump_memory64_info(&dc); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + } + /* fill the remaining directory entries with 0's (unused stream types) */ /* NOTE: this should always come last in the dump! */ for (i = idx_stream; i < nStreams; i++) writeat(&dc, mdHead.StreamDirectoryRva + i * sizeof(emptyDir), &emptyDir, sizeof(emptyDir)); HeapFree(GetProcessHeap(), 0, dc.mem); + HeapFree(GetProcessHeap(), 0, dc.mem64); HeapFree(GetProcessHeap(), 0, dc.modules); HeapFree(GetProcessHeap(), 0, dc.threads); diff --git a/include/dbghelp.h b/include/dbghelp.h index 6e8d375..4210616 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -747,6 +747,19 @@ typedef struct _MINIDUMP_MEMORY_LIST MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[1]; /* FIXME: 0-sized array not supported */ } MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 +{ + ULONG64 StartOfMemoryRange; + ULONG64 DataSize; +} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; + +typedef struct _MINIDUMP_MEMORY64_LIST +{ + ULONG64 NumberOfMemoryRanges; + RVA64 BaseRva; + MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; + #define MINIDUMP_MISC1_PROCESS_ID 0x00000001 #define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 -- 1.8.3.1

1 0

[PATCH vkd3d] README: Expand on building and using vkd3d.
by Henri Verbeet Jan. 25, 2019

Jan. 25, 2019

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Andrew's patch, with only minor changes to whitespace and quoting. README | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README b/README index f353c36..bec91a9 100644 --- a/README +++ b/README @@ -4,3 +4,27 @@ The vkd3d 3D Graphics Library Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very similar, but not identical, to Direct3D 12. + +============== +Building vkd3d +============== + +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.88). + +Vkd3d generates some of its headers from IDL files. If you are using the +release tarballs, then these headers are pre-generated and are included. If +you are building from git, then they will be generated at build-time using +widl. By default, vkd3d will use the widl found in `PATH'. If widl is not +available or is not recent (>= 3.0 or so), then you can build Wine with +`make tools/widl' to avoid building all of Wine. You can then point vkd3d's +configure at that widl binary with `WIDL="/path/to/widl"'. + +=========== +Using vkd3d +=========== + +Vkd3d can be used by projects that target Direct3D 12 as a drop-in replacement +at build-time with some modest source modifications. + +If vkd3d is available when building Wine, then Wine will use it to support +Direct3D 12 applications. -- 2.11.0

1 0

[PATCH vkd3d] vkd3d: Avoid passing 0 miplevels to Vulkan.
by Józef Kucia Jan. 25, 2019

Jan. 25, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 016d050998b0..c65cb60ddc56 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -613,12 +613,20 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, { static const D3D12_HEAP_PROPERTIES heap_properties = {D3D12_HEAP_TYPE_DEFAULT}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + D3D12_RESOURCE_DESC validated_desc; VkMemoryRequirements requirements; VkImage vk_image; HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + if (!desc->MipLevels) + { + validated_desc = *desc; + validated_desc.MipLevels = max_miplevel_count(desc); + desc = &validated_desc; + } + /* 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))) { -- 2.19.2

2 1