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

Jacek Caban : jscript: Support embedded null bytes in unescape.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 79557db98133a2c6062d7416448a41bd4ed33d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79557db98133a2c6062d7416… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 17:44:07 2019 +0100 jscript: Support embedded null bytes in unescape. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 4 ++-- dlls/jscript/lex.c | 25 +++++++++++++++---------- dlls/jscript/parser.h | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index d440543..b5e6e10 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -89,14 +89,14 @@ static HRESULT parse_json_string(json_parse_ctx_t *ctx, WCHAR **r) return E_OUTOFMEMORY; if(len) memcpy(buf, ptr, len*sizeof(WCHAR)); - buf[len] = 0; - if(!unescape(buf)) { + if(!unescape(buf, &len)) { FIXME("unescape failed\n"); heap_free(buf); return E_FAIL; } + buf[len] = 0; ctx->ptr++; *r = buf; return S_OK; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index be20e99..2f0172c 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -260,19 +260,20 @@ static BOOL skip_spaces(parser_ctx_t *ctx) return ctx->ptr != ctx->end; } -BOOL unescape(WCHAR *str) +BOOL unescape(WCHAR *str, size_t *len) { - WCHAR *pd, *p, c; + WCHAR *pd, *p, c, *end = str + *len; int i; pd = p = str; - while(*p) { + while(p < end) { if(*p != '\\') { *pd++ = *p++; continue; } - p++; + if(++p == end) + return FALSE; switch(*p) { case '\'': @@ -296,6 +297,8 @@ BOOL unescape(WCHAR *str) c = '\r'; break; case 'x': + if(p + 2 >= end) + return FALSE; i = hex_to_int(*++p); if(i == -1) return FALSE; @@ -307,6 +310,8 @@ BOOL unescape(WCHAR *str) c += i; break; case 'u': + if(p + 4 >= end) + return FALSE; i = hex_to_int(*++p); if(i == -1) return FALSE; @@ -330,9 +335,9 @@ BOOL unescape(WCHAR *str) default: if(isdigitW(*p)) { c = *p++ - '0'; - if(isdigitW(*p)) { + if(p < end && isdigitW(*p)) { c = c*8 + (*p++ - '0'); - if(isdigitW(*p)) + if(p < end && isdigitW(*p)) c = c*8 + (*p++ - '0'); } p--; @@ -345,7 +350,7 @@ BOOL unescape(WCHAR *str) p++; } - *pd = 0; + *len = pd - str; return TRUE; } @@ -372,7 +377,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret, WCHAR endc { const WCHAR *ptr = ++ctx->ptr; WCHAR *wstr; - int len; + size_t len; while(ctx->ptr < ctx->end && *ctx->ptr != endch) { if(*ctx->ptr++ == '\\') @@ -386,15 +391,15 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret, WCHAR endc *ret = wstr = parser_alloc(ctx, (len+1)*sizeof(WCHAR)); memcpy(wstr, ptr, len*sizeof(WCHAR)); - wstr[len] = 0; ctx->ptr++; - if(!unescape(wstr)) { + if(!unescape(wstr, &len)) { WARN("unescape failed\n"); return lex_error(ctx, E_FAIL); } + wstr[len] = 0; return tStringLiteral; } diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 03f504f..f4f044c 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -63,7 +63,7 @@ static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) } BOOL is_identifier_char(WCHAR) DECLSPEC_HIDDEN; -BOOL unescape(WCHAR*) DECLSPEC_HIDDEN; +BOOL unescape(WCHAR*,size_t*) DECLSPEC_HIDDEN; HRESULT parse_decimal(const WCHAR**,const WCHAR*,double*) DECLSPEC_HIDDEN; typedef enum {

1 0

Józef Kucia : vkd3d: Emulate NULL CBV descriptors.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: 401739a387df619bd85424f73af613e6da2a902d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=401739a387df619bd85424f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:14 2019 +0100 vkd3d: Emulate NULL CBV descriptors. 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 | 6 ++++ libs/vkd3d/resource.c | 83 ++++++++++++++++++++++++++++++++++++++-------- libs/vkd3d/vkd3d_private.h | 14 ++++++++ 3 files changed, 89 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3d9b8c9..c1de98f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1536,6 +1536,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_private_store_destroy(&device->private_store); + vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); @@ -2704,6 +2705,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) goto out_free_private_store; + if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + goto out_stop_fence_worker; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) @@ -2711,6 +2715,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return S_OK; +out_stop_fence_worker: + vkd3d_fence_worker_stop(&device->fence_worker, device); out_free_private_store: vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1176538..06e7c7d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,10 +18,12 @@ #include "vkd3d_private.h" +#define VKD3D_NULL_CBV_BUFFER_SIZE 4 + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { - VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; + const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; VkMemoryPropertyFlags required_flags; unsigned int i; @@ -517,10 +519,10 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, if ((vr = VK_CALL(vkCreateBuffer(device->vk_device, &buffer_info, NULL, vk_buffer))) < 0) { WARN("Failed to create Vulkan buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); + *vk_buffer = VK_NULL_HANDLE; } - return S_OK; + return hresult_from_vk_result(vr); } static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) @@ -670,10 +672,9 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu WARN("Failed to bind memory, vr %d.\n", vr); VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); *vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); } - return S_OK; + return hresult_from_vk_result(vr); } static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, @@ -1753,17 +1754,21 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, return; } - if (!desc->BufferLocation) + buffer_info = &descriptor->u.vk_cbv_info; + if (desc->BufferLocation) { - FIXME("NULL CBV not implemented.\n"); - return; + resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); + buffer_info->buffer = resource->u.vk_buffer; + buffer_info->offset = desc->BufferLocation - resource->gpu_address; + buffer_info->range = min(desc->SizeInBytes, resource->desc.Width - buffer_info->offset); + } + else + { + /* NULL descriptor */ + buffer_info->buffer = device->null_resources.vk_uniform_buffer; + buffer_info->offset = 0; + buffer_info->range = VKD3D_NULL_CBV_BUFFER_SIZE; } - - resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); - buffer_info = &descriptor->u.vk_cbv_info; - buffer_info->buffer = resource->u.vk_buffer; - buffer_info->offset = desc->BufferLocation - resource->gpu_address; - buffer_info->range = min(desc->SizeInBytes, resource->desc.Width - buffer_info->offset); descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; @@ -2874,3 +2879,53 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return S_OK; } + +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) +{ + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC buffer_desc; + HRESULT hr; + + memset(null_resources, 0, sizeof(*null_resources)); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + buffer_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + buffer_desc.Alignment = 0; + buffer_desc.Width = VKD3D_NULL_CBV_BUFFER_SIZE; + buffer_desc.Height = 1; + buffer_desc.DepthOrArraySize = 1; + buffer_desc.MipLevels = 1; + buffer_desc.Format = DXGI_FORMAT_UNKNOWN; + buffer_desc.SampleDesc.Count = 1; + buffer_desc.SampleDesc.Quality = 0; + buffer_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + buffer_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; + + if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &buffer_desc, &null_resources->vk_uniform_buffer))) + goto fail; + + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_uniform_buffer, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_uniform_buffer_memory))) + goto fail; + + return S_OK; + +fail: + ERR("Failed to initialize NULL resources, hr %#x.\n", hr); + vkd3d_destroy_null_resources(null_resources, device); + return hr; +} + +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_uniform_buffer, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_uniform_buffer_memory, NULL)); + memset(null_resources, 0, sizeof(*null_resources)); +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b2fbaf..9ddc50e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -868,6 +868,18 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ struct d3d12_command_signature **signature) DECLSPEC_HIDDEN; struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN; +/* NULL resources */ +struct vkd3d_null_resources +{ + VkBuffer vk_uniform_buffer; + VkDeviceMemory vk_uniform_buffer_memory; +}; + +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) DECLSPEC_HIDDEN; + /* ID3D12Device */ struct d3d12_device { @@ -910,6 +922,8 @@ struct d3d12_device struct vkd3d_private_store private_store; HRESULT removed_reason; + + struct vkd3d_null_resources null_resources; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance,

1 0

Józef Kucia : tests: Add basic test for NULL CBV descriptors.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: e20ddc48a63ccc4f7340909f55652906ebbfb128 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e20ddc48a63ccc4f7340909… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:15 2019 +0100 tests: Add basic test for NULL CBV descriptors. 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 | 2 + tests/d3d12.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 231123b..a1f87b2 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,8 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_MIP_LEVELS = 15; const UINT D3D12_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION = 2048; const UINT D3D12_REQ_TEXTURE1D_U_DIMENSION = 16384; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5ae8511..44e128a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15387,7 +15387,7 @@ static void test_descriptors_visibility(void) destroy_test_context(&context); } -static void test_null_descriptors(void) +static void test_create_null_descriptors(void) { D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; @@ -15456,6 +15456,117 @@ static void test_null_descriptors(void) destroy_test_context(&context); } +static void test_null_cbv(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + D3D12_DESCRIPTOR_RANGE descriptor_range; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int index; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + uint index; + + cbuffer null_cb + { + float4 data[1024]; + }; + + float4 main() : SV_Target + { + return data[index]; + } +#endif + 0x43425844, 0xa69026e2, 0xccf934be, 0x11f0a922, 0x95e9ab51, 0x00000001, 0x000000f0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000078, 0x00000050, 0x0000001e, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, 0x00000001, + 0x00000400, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000036, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x04208e46, + 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + device = context.device; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 1; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 1; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + + cbv_desc.BufferLocation = 0; + cbv_desc.SizeInBytes = 0; /* Size doesn't appear to matter for NULL CBV. */ + ID3D12Device_CreateConstantBufferView(device, &cbv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (index = 0; index < 1200; index += 100) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &index, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(context.render_target, 0, queue, command_list, 0x00000000, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, @@ -25371,7 +25482,8 @@ START_TEST(d3d12) run_test(test_copy_descriptors); run_test(test_copy_descriptors_range_sizes); run_test(test_descriptors_visibility); - run_test(test_null_descriptors); + run_test(test_create_null_descriptors); + run_test(test_null_cbv); run_test(test_get_copyable_footprints); run_test(test_depth_stencil_sampling); run_test(test_depth_load);

1 0

Józef Kucia : vkd3d: Prefer cached memory for readback heaps.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: 7858eb6a83c947dd43d08da5c05fc9995de289fb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7858eb6a83c947dd43d08da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:16 2019 +0100 vkd3d: Prefer cached memory for readback heaps. Reading uncached memory is slow. 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 | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 06e7c7d..df3ab5d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -24,21 +24,26 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; - VkMemoryPropertyFlags required_flags; - unsigned int i; + VkMemoryPropertyFlags flags[2]; + unsigned int i, j, count = 0; switch (heap_properties->Type) { case D3D12_HEAP_TYPE_DEFAULT: - required_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + break; + + case D3D12_HEAP_TYPE_UPLOAD: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); /* fall-through */ - case D3D12_HEAP_TYPE_UPLOAD: case D3D12_HEAP_TYPE_READBACK: - required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; default: @@ -46,12 +51,17 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 return ~0u; } - for (i = 0; i < memory_info->memoryTypeCount; ++i) + for (j = 0; j < count; ++j) { - if (!(memory_type_mask & (1u << i))) - continue; - if ((memory_info->memoryTypes[i].propertyFlags & required_flags) == required_flags) - return i; + VkMemoryPropertyFlags preferred_flags = flags[j]; + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & preferred_flags) == preferred_flags) + return i; + } } return ~0u;

1 0

Józef Kucia : tests: Accumulate coverage mask from all fragments.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: f91422eb407793bd0b5da4d6f8b58f5e645feac5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f91422eb407793bd0b5da4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:17 2019 +0100 tests: Accumulate coverage mask from all fragments. Clipping may divide the triangle and produce multiple fragments per pixel. 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 | 160 +++++++++++++++++++++++------------------------ tests/d3d12_test_utils.h | 8 +-- 2 files changed, 84 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f91422eb407793bd0b5…

1 0

Józef Kucia : vkd3d: Set Vulkan object names for NULL CBV resources.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: 085456005caa2bebea89dbcab1bb7c1756596f6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=085456005caa2bebea89dbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:18 2019 +0100 vkd3d: Set Vulkan object names for NULL CBV resources. 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 | 9 +++++++++ libs/vkd3d/utils.c | 26 ++++++++++++++++++-------- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index df3ab5d..f197c93 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2895,6 +2895,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC buffer_desc; + VkResult vr; HRESULT hr; memset(null_resources, 0, sizeof(*null_resources)); @@ -2918,10 +2919,18 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &buffer_desc, &null_resources->vk_uniform_buffer))) goto fail; + if ((vr = vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL CBV buffer")) < 0) + WARN("Failed to set object name, vr %d.\n", vr); + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_uniform_buffer, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_uniform_buffer_memory))) goto fail; + if ((vr = vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL CBV memory")) < 0) + WARN("Failed to set object name, vr %d.\n", vr); + return S_OK; fail: diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 27333f2..666319e 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -643,11 +643,26 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, return hr; } -HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const char *name) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDebugMarkerObjectNameInfoEXT info; + + if (!device->vk_info.EXT_debug_marker) + return VK_SUCCESS; + + info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; + info.pNext = NULL; + info.objectType = vk_object_type; + info.object = vk_object; + info.pObjectName = name; + return VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); +} + +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +{ char *name_utf8; VkResult vr; @@ -660,12 +675,7 @@ HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object if (!(name_utf8 = vkd3d_strdup_w_utf8(name, device->wchar_size))) return E_OUTOFMEMORY; - info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; - info.pNext = NULL; - info.objectType = vk_object_type; - info.object = vk_object; - info.pObjectName = name_utf8; - vr = VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); + vr = vkd3d_set_vk_object_name_utf8(device, vk_object, vk_object_type, name_utf8); vkd3d_free(name_utf8); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9ddc50e..fa2c460 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1043,6 +1043,8 @@ static inline void vkd3d_set_thread_name(const char *name) #endif } +VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN;

1 0

Józef Kucia : tests: Print driver info from VK_KHR_driver_properties.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: e36024c87dc882643cee6e42294eb01d8b4563ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e36024c87dc882643cee6e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:19 2019 +0100 tests: Print driver info from VK_KHR_driver_properties. In preparation for the next commit. 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> --- Makefile.am | 3 +- tests/d3d12_crosstest.h | 161 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d854a5b..0bd7889 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,8 @@ AM_DEFAULT_SOURCE_EXT = .c if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) -tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ +tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ +tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la endif diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6357d48..d0019dc 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -55,6 +55,7 @@ typedef int HRESULT; # include "vkd3d_dxgi1_4.h" #else # include <pthread.h> +# include "vkd3d.h" # include "vkd3d_utils.h" #endif @@ -324,12 +325,170 @@ static inline bool is_amd_device(ID3D12Device *device) return desc.VendorId == 0x1002; } #else +static bool have_VK_KHR_driver_properties; + +static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) +{ + struct vkd3d_optional_instance_extensions_info optional_extensions_info; + struct vkd3d_instance_create_info instance_create_info; + + static const char * const optional_instance_extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + }; + + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + + memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = &optional_extensions_info; + instance_create_info.pfn_signal_event = vkd3d_signal_event; + instance_create_info.wchar_size = sizeof(WCHAR); + + return vkd3d_create_instance(&instance_create_info, instance); +} + +static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_device_create_info device_create_info; + + static const char * const device_extensions[] = + { + VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, + }; + + memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.minimum_feature_level = minimum_feature_level; + device_create_info.instance = instance; + if (have_VK_KHR_driver_properties) + { + device_create_info.device_extensions = device_extensions; + device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + } + + return vkd3d_create_device(&device_create_info, iid, device); +} + +static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) +{ + VkExtensionProperties *properties; + bool ret = false; + unsigned int i; + uint32_t count; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return false; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = true; + break; + } + } + + free(properties); + return ret; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_instance *instance; + HRESULT hr; + + if (SUCCEEDED(hr = create_vkd3d_instance(&instance))) + { + hr = create_vkd3d_device(instance, minimum_feature_level, iid, device); + vkd3d_instance_decref(instance); + } + + return hr; +} + static IUnknown *create_adapter(void) { return NULL; } -static void init_adapter_info(void) {} +static void init_adapter_info(void) +{ + PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties2 device_properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + struct vkd3d_instance *instance; + VkInstance vk_instance; + ID3D12Device *device; + uint32_t count, i; + VkResult vr; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + have_VK_KHR_driver_properties = true; + for (i = 0; i < count; ++i) + { + if (!check_device_extension(vk_physical_devices[i],VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) + { + have_VK_KHR_driver_properties = false; + break; + } + } + + free(vk_physical_devices); + + if (!have_VK_KHR_driver_properties) + goto done; + + if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + goto done; + + vk_physical_device = vkd3d_get_vk_physical_device(device); + + pfn_vkGetPhysicalDeviceProperties2KHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); + + memset(&device_properties2, 0, sizeof(device_properties2)); + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &driver_properties; + memset(&driver_properties, 0, sizeof(driver_properties)); + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + + ID3D12Device_Release(device); + +done: + vkd3d_instance_decref(instance); +} static inline bool is_amd_device(ID3D12Device *device) {

1 0

Józef Kucia : tests: Mark driver-specific test failures as bugs.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: af50b9d2a027ea99691bebd51ffb1d1c86af95a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af50b9d2a027ea99691bebd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:20 2019 +0100 tests: Mark driver-specific test failures as bugs. Allows running all tests cleanly on Intel and Nvidia. 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/private/vkd3d_test.h | 57 ++++++++++++++++++++++++++++++++++++-------- tests/d3d12.c | 35 ++++++++++++++++++++------- tests/d3d12_crosstest.h | 38 +++++++++++++++++++++++++++-- 3 files changed, 109 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=af50b9d2a027ea99691…

1 0

Józef Kucia : tests: Skip DXGI_FORMAT_R24G8_TYPELESS tests on radv.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: vkd3d Branch: master Commit: f4ba057279bff85b02766a3551f41367efcc04f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f4ba057279bff85b02766a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 4 13:15:21 2019 +0100 tests: Skip DXGI_FORMAT_R24G8_TYPELESS tests on radv. Allows running all tests cleanly on radv. We have to implement formats emulation in vkd3d to fix the test. 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac58565..0e32f40 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16162,6 +16162,13 @@ static void test_depth_stencil_sampling(void) { vkd3d_test_set_context("Test %u", i); + /* FIXME: Implement format substitution. */ + if (tests[i].typeless_format == DXGI_FORMAT_R24G8_TYPELESS && is_radv_device(device)) + { + skip("radv doesn't support VK_FORMAT_D24_UNORM_S8_UINT.\n"); + continue; + } + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width,

1 0

Alexandre Julliard : Wine release 3.0.5
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: website Branch: master Commit: 1a31669842ff1478ca69c20bb16ef912e1069d57 URL: https://source.winehq.org/git/website.git/?a=commit;h=1a31669842ff1478ca69c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 3 20:21:42 2019 +0100 Wine release 3.0.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019030301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019030301.xml b/news/en/2019030301.xml new file mode 100644 index 0000000..b889ac3 --- /dev/null +++ b/news/en/2019030301.xml @@ -0,0 +1,12 @@ +<news> +<date>March 3, 2019</date> +<title>Wine 3.0.5 Released</title> +<body> + The Wine maintenance release 3.0.5 is now available. + <a href="{$root}/announce/3.0.5">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0