wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Józef Kucia : vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 7f963c124d879e63a2d58fe5a5250aa0b948d3c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7f963c124d879e63a2d58fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:51 2019 +0200 vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers. 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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d005fa8..bcf523e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -523,10 +523,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT) { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + + if (device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } } if (heap_type == D3D12_HEAP_TYPE_UPLOAD)

1 0

Józef Kucia : vkd3d: End conditional rendering before ending command buffer.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 16c62ded81da43f04c39a299eeeeddc6afaab982 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16c62ded81da43f04c39a29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:50 2019 +0200 vkd3d: End conditional rendering before ending command buffer. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5b877db..99f607a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2254,6 +2254,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; d3d12_command_list_end_current_render_pass(list); + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) {

1 0

Józef Kucia : vkd3d: Begin and end conditional rendering outside render passes.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 9939712560b124715debe9d7fb19adb1868b66c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9939712560b124715debe9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:49 2019 +0200 vkd3d: Begin and end conditional rendering outside render passes. The Vulkan spec says: "Conditional rendering must also either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances)." 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 31a5d20..5b877db 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4941,11 +4941,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo vk_procs = &list->device->vk_procs; + /* FIXME: Add support for conditional rendering in render passes. */ + d3d12_command_list_end_current_render_pass(list); + if (resource) { VkConditionalRenderingBeginInfoEXT cond_info; - if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + if (aligned_buffer_offset & (sizeof(uint64_t) - 1)) { WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); return; @@ -4957,7 +4960,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo return; } - FIXME("Predication doesn't support clear and copy commands, " + FIXME_ONCE("Predication doesn't support clear and copy commands, " "and predication values are treated as 32-bit values.\n"); cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT;

1 0

Józef Kucia : tests: Fix test failures in conditional rendering tests.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 18991337b76b1d8877ecdd41145d3b21549f61c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18991337b76b1d8877ecdd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:48 2019 +0200 tests: Fix test failures in conditional rendering tests. 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 | 9 ++++++++- tests/d3d12_crosstest.h | 27 +++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index fc542ea..a077c60 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30932,6 +30932,13 @@ static void test_conditional_rendering(void) command_list = context.list; queue = context.queue; + if (is_intel_windows_device(context.device)) + { + skip("Predicated rendering is broken on Intel.\n"); + destroy_test_context(&context); + return; + } + conditions = create_default_buffer(context.device, sizeof(predicate_args), D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list); @@ -30950,7 +30957,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 4a49062..22844ab 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -323,14 +323,15 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } -static inline bool is_amd_windows_device(ID3D12Device *device) +static inline bool get_adapter_desc(ID3D12Device *device, DXGI_ADAPTER_DESC *desc) { - DXGI_ADAPTER_DESC desc = {0}; IDXGIFactory4 *factory; IDXGIAdapter *adapter; HRESULT hr; LUID luid; + memset(desc, 0, sizeof(*desc)); + if (!vkd3d_test_platform_is_windows()) return false; @@ -342,14 +343,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); if (SUCCEEDED(hr)) { - hr = IDXGIAdapter_GetDesc(adapter, &desc); + hr = IDXGIAdapter_GetDesc(adapter, desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); } IDXGIFactory4_Release(factory); + return SUCCEEDED(hr); +} + +static inline bool is_amd_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; + + return get_adapter_desc(device, &desc) && desc.VendorId == 0x1002; +} + +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; - return desc.VendorId == 0x1002; + return get_adapter_desc(device, &desc) && desc.VendorId == 0x8086; } static inline bool is_mesa_device(ID3D12Device *device) @@ -566,6 +580,11 @@ static inline bool is_amd_windows_device(ID3D12Device *device) return false; } +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + return false; +} + static inline bool is_mesa_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties;

1 0

Józef Kucia : tests: Fix test_conditional_rendering() .
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 8d03148e11b479747f287fe1cdd7633479ac3082 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d03148e11b479747f287fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:47 2019 +0200 tests: Fix test_conditional_rendering(). Fixes crashes, Vulkan and Direct3D validation errors. * Fix state transitions. * Use a multisample texture with ResolveSubresource(). 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 | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index dbced1a..fc542ea 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30868,8 +30868,11 @@ static void test_conditional_rendering(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12Resource *texture, *texture_copy; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_HEAP_PROPERTIES heap_properties; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + D3D12_RESOURCE_DESC resource_desc; struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; @@ -30884,6 +30887,7 @@ static void test_conditional_rendering(void) static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float ms_color[] = {0.345f, 0.282f, 0.219f, 0.156f}; static const uint32_t init_value = 0xdeadbeef; static const D3D12_SUBRESOURCE_DATA copy_data[] = { @@ -31033,6 +31037,8 @@ static void test_conditional_rendering(void) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); @@ -31109,17 +31115,43 @@ static void test_conditional_rendering(void) check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); - /* ResolveSubresource(). */ + /* Multisample texture. */ + ID3D12Resource_Release(texture); + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + hr = ID3D12Device_CreateCommittedResource(context.device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS; + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + ID3D12Device_CreateRenderTargetView(context.device, texture, &rtv_desc, + get_cpu_rtv_handle(&context, context.rtv_heap, 0)); + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, ms_color, 0, NULL); + + /* ResolveSubresource(). */ transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, texture_copy, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_RESOLVE_DEST); transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); /* Skip. */ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); @@ -31147,7 +31179,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 2); reset_command_list(command_list, context.allocator); @@ -31156,7 +31188,7 @@ static void test_conditional_rendering(void) buffer = create_default_buffer(context.device, 512, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data(buffer, 0, sizeof(uint32_t), &init_value, queue, command_list); + upload_buffer_data(buffer, 0, sizeof(init_value), &init_value, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, buffer, 0, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);

1 0

Józef Kucia : include/vkd3d_utils: Declare all exported functions.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 7240534abc0dbcb5f6c2e4190548d94369610fdd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7240534abc0dbcb5f6c2e41… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:32 2019 +0200 include/vkd3d_utils: Declare all exported functions. 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> --- demos/demo.h | 1 - demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/demos/demo.h b/demos/demo.h index 2869ea7..b2b9317 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -141,7 +141,6 @@ static inline HRESULT demo_create_root_signature(ID3D12Device *device, #ifdef _WIN32 #include "demo_win32.h" #else -#include <vkd3d_utils.h> #define INFINITE VKD3D_INFINITE #include "demo_xcb.h" #endif diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 40e2534..6fae790 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,6 +19,7 @@ #define VK_USE_PLATFORM_XCB_KHR #include <vkd3d.h> +#include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 8a5689a..4a5ee5d 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H +#include <vkd3d.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -34,6 +36,18 @@ HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); void vkd3d_destroy_event(HANDLE event); +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device); +HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + +/* 1.2 */ +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, + SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Józef Kucia : tests: Add test for parsing version.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: f723a791d50a0e61c340cb0b706dfa3038c5e353 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f723a791d50a0e61c340cb0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:31 2019 +0200 tests: Add test for parsing version. 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 | 1 + include/private/vkd3d_common.h | 14 ++++++++++++ libs/vkd3d/device.c | 15 +------------ tests/vkd3d_common.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 299ec26..fe3a363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,7 @@ vkd3d_demos_shaders = \ vkd3d_tests = \ tests/vkd3d_api \ + tests/vkd3d_common \ tests/vkd3d_shader_api vkd3d_cross_tests = \ diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 16c31e6..c696f88 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,6 +22,8 @@ #include "config.h" #include "vkd3d_windows.h" +#include <ctype.h> + #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #endif @@ -137,4 +139,16 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # error "atomic_add_fetch() not implemented for this platform" #endif /* HAVE_SYNC_ADD_AND_FETCH */ +static inline void vkd3d_parse_version(const char *version, int *major, int *minor) +{ + *major = atoi(version); + + while (isdigit(*version)) + ++version; + if (*version == '.') + ++version; + + *minor = atoi(version); +} + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1092cff..7522c41 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,8 +18,6 @@ #include "vkd3d_private.h" -#include <ctype.h> - #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -94,20 +92,9 @@ struct vk_struct static uint32_t vkd3d_get_vk_version(void) { - const char *ptr = PACKAGE_VERSION; int major, minor; - major = atoi(ptr); - - while (isdigit(*ptr)) - ++ptr; - if (*ptr == '.') - ++ptr; - - minor = atoi(ptr); - - TRACE("Version %d.%d.\n", major, minor); - + vkd3d_parse_version(PACKAGE_VERSION, &major, &minor); return VK_MAKE_VERSION(major, minor, 0); } diff --git a/tests/vkd3d_common.c b/tests/vkd3d_common.c new file mode 100644 index 0000000..379c8b0 --- /dev/null +++ b/tests/vkd3d_common.c @@ -0,0 +1,49 @@ +/* + * Copyright 2019 Józef Kucia 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_common.h" +#include "vkd3d_test.h" + +static void check_version(const char *v, int expected_major, int expected_minor) +{ + int major, minor; + + vkd3d_parse_version(v, &major, &minor); + ok(major == expected_major && minor == expected_minor, + "Got %d.%d, expected %d.%d for %s.\n", + major, minor, expected_major, expected_minor, v); +} + +static void test_parse_version(void) +{ + check_version("", 0, 0); + check_version(".3", 0, 3); + check_version(".4.5", 0, 4); + + check_version("1", 1, 0); + check_version("2", 2, 0); + + check_version("1.0", 1, 0); + check_version("1.1", 1, 1); + check_version("2.3.0", 2, 3); +} + +START_TEST(vkd3d_common) +{ + run_test(test_parse_version); +}

1 0

Józef Kucia : include: Document API versions.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 096dfde2805b0a33f438a6b427c31c89f050e998 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=096dfde2805b0a33f438a6b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:30 2019 +0200 include: Document API versions. 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.h | 39 ++++++++++++++++++++++----------------- include/vkd3d_shader.h | 1 + include/vkd3d_utils.h | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index b78076e..e2d9ec8 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -36,12 +36,15 @@ extern "C" { enum vkd3d_structure_type { + /* 1.0 */ VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + /* 1.1 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, + /* 1.2 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, @@ -74,7 +77,7 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.1. */ struct vkd3d_optional_instance_extensions_info { enum vkd3d_structure_type type; @@ -84,7 +87,7 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.2. */ struct vkd3d_application_info { enum vkd3d_structure_type type; @@ -116,7 +119,7 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* Extends vkd3d_device_create_info. */ +/* Extends vkd3d_device_create_info. Available since 1.2. */ struct vkd3d_optional_device_extensions_info { enum vkd3d_structure_type type; @@ -167,18 +170,19 @@ ULONG vkd3d_resource_incref(ID3D12Resource *resource); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +/* 1.1 */ DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); + +/* 1.2 */ +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #endif /* VKD3D_NO_PROTOTYPES */ @@ -209,18 +213,19 @@ typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); +/* 1.1 */ typedef DXGI_FORMAT (*PFN_vkd3d_get_dxgi_format)(VkFormat format); -typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); + +/* 1.2 */ +typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #ifdef __cplusplus } diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e6cccd8..fcf5db8 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -29,6 +29,7 @@ extern "C" { enum vkd3d_shader_structure_type { + /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 6c926e4..8a5689a 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -28,6 +28,7 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) +/* 1.0 */ HANDLE vkd3d_create_event(void); HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds);

1 0

Józef Kucia : vkd3d: Use vkd3d_waiting_fence structure in more places.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 1a42564eb941da000f7177d0afac7585499a30ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a42564eb941da000f7177d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:29 2019 +0200 vkd3d: Use vkd3d_waiting_fence structure in more places. 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 | 17 +++++++---------- libs/vkd3d/vkd3d_private.h | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d3feb78..31a5d20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -247,6 +247,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value, struct vkd3d_queue *queue, uint64_t queue_sequence_number) { + struct vkd3d_waiting_fence *waiting_fence; int rc; TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value); @@ -266,10 +267,11 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, } worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence; - worker->enqueued_fences[worker->enqueued_fence_count].fence = fence; - worker->enqueued_fences[worker->enqueued_fence_count].value = value; - worker->enqueued_fences[worker->enqueued_fence_count].queue = queue; - worker->enqueued_fences[worker->enqueued_fence_count].queue_sequence_number = queue_sequence_number; + waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence; + waiting_fence->fence = fence; + waiting_fence->value = value; + waiting_fence->queue = queue; + waiting_fence->queue_sequence_number = queue_sequence_number; ++worker->enqueued_fence_count; InterlockedIncrement(&fence->pending_worker_operation_count); @@ -337,12 +339,7 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i]; worker->vk_fences[worker->fence_count] = current->vk_fence; - - worker->fences[worker->fence_count].fence = current->fence; - worker->fences[worker->fence_count].value = current->value; - worker->fences[worker->fence_count].queue = current->queue; - worker->fences[worker->fence_count].queue_sequence_number = current->queue_sequence_number; - + worker->fences[worker->fence_count] = current->waiting_fence; ++worker->fence_count; } assert(worker->fence_count == count); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 97b5de5..7cbf0d8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -152,6 +152,14 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +struct vkd3d_waiting_fence +{ + struct d3d12_fence *fence; + uint64_t value; + struct vkd3d_queue *queue; + uint64_t queue_sequence_number; +}; + struct vkd3d_fence_worker { union vkd3d_thread_handle thread; @@ -165,23 +173,14 @@ struct vkd3d_fence_worker struct vkd3d_enqueued_fence { VkFence vk_fence; - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; + struct vkd3d_waiting_fence waiting_fence; } *enqueued_fences; size_t enqueued_fences_size; size_t fence_count; VkFence *vk_fences; size_t vk_fences_size; - struct vkd3d_waiting_fence - { - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; - } *fences; + struct vkd3d_waiting_fence *fences; size_t fences_size; struct d3d12_device *device;

1 0

Józef Kucia : vkd3d: Try to guess application name.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: 3d681737c9b1a2e1eeaab19bdc0e75c8de48dd08 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d681737c9b1a2e1eeaab19… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 17 15:43:28 2019 +0200 vkd3d: Try to guess application name. 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 | 7 +++++++ libs/vkd3d/utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 53 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 37bfc40..1092cff 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -467,6 +467,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; + char application_name[PATH_MAX]; uint32_t extension_count; const char **extensions; VkInstance vk_instance; @@ -530,6 +531,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = vkd3d_application_info->engine_version; } } + else if (vkd3d_get_program_name(application_name)) + { + application_info.pApplicationName = application_name; + } + + TRACE("Application: %s.\n", debugstr_a(application_info.pApplicationName)); if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 4483a8d..245f297 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -602,6 +602,50 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } +#ifdef _GNU_SOURCE + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + char *name, *p, *real_path = NULL; + + if ((name = strrchr(program_invocation_name, '/'))) + { + real_path = realpath("/proc/self/exe", NULL); + + /* Try to strip command line arguments. */ + if (real_path && (p = strrchr(real_path, '/')) + && !strncmp(real_path, program_invocation_name, strlen(real_path))) + { + name = p; + } + + ++name; + } + else if ((name = strrchr(program_invocation_name, '\\'))) + { + ++name; + } + else + { + name = program_invocation_name; + } + + strncpy(program_name, name, PATH_MAX); + program_name[PATH_MAX - 1] = '\0'; + free(real_path); + return true; +} + +#else + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + *program_name = '\0'; + return false; +} + +#endif /* _GNU_SOURCE */ + static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e0d563f..97b5de5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1203,6 +1203,8 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; + static inline void vkd3d_set_thread_name(const char *name) { #if defined(HAVE_PTHREAD_SETNAME_NP_2)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019