wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Józef Kucia : tests: Add tests for selecting physical devices.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: cd2c636bf55eb090e0efa7b7c1e80d84b176c2bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cd2c636bf55eb090e0efa7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:10 2018 +0100 tests: Add tests for selecting physical devices. 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 + tests/vkd3d_api.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a99fa56..f796bef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,6 +120,7 @@ check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ +tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = @XCB_CFLAGS@ diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 7ca5d26..bda0c4e 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -94,8 +94,8 @@ static void test_create_instance(void) static void test_create_device(void) { + struct vkd3d_instance *instance, *tmp_instance; struct vkd3d_device_create_info create_info; - struct vkd3d_instance *instance; ID3D12Device *device; ULONG refcount; HRESULT hr; @@ -125,6 +125,8 @@ static void test_create_device(void) refcount = vkd3d_instance_incref(instance); ok(refcount >= 3, "Got unexpected refcount %u.\n", refcount); vkd3d_instance_decref(instance); + tmp_instance = vkd3d_instance_from_device(device); + ok(tmp_instance == instance, "Got instance %p, expected %p.\n", tmp_instance, instance); refcount = ID3D12Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -137,6 +139,61 @@ static void test_create_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_physical_device(void) +{ + struct vkd3d_device_create_info create_info; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + struct vkd3d_instance *instance; + VkInstance vk_instance; + ID3D12Device *device; + uint32_t i, count; + ULONG refcount; + VkResult vr; + HRESULT hr; + + hr = vkd3d_create_instance(&instance_default_create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + vk_instance = vkd3d_get_vk_instance(instance); + ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n"); + + create_info = device_default_create_info; + create_info.instance = instance; + create_info.instance_create_info = NULL; + create_info.vk_physical_device = VK_NULL_HANDLE; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + trace("Default Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + 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); + + for (i = 0; i < count; ++i) + { + trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); + + create_info.vk_physical_device = vk_physical_devices[i]; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + ok(vk_physical_device == vk_physical_devices[i], + "Got unexpected Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + free(vk_physical_devices); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static void test_vkd3d_queue(void) { ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; @@ -198,5 +255,6 @@ START_TEST(vkd3d_api) run_test(test_create_instance); run_test(test_create_device); + run_test(test_physical_device); run_test(test_vkd3d_queue); }

1 0

Józef Kucia : libs/vkd3d: Introduce function to get Vulkan instance from vkd3d instance.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 88835021219b6363d516bb59cd3230d9ead0fe52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=88835021219b6363d516bb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:09 2018 +0100 libs/vkd3d: Introduce function to get Vulkan instance from vkd3d instance. 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_xcb.h | 2 +- include/vkd3d.h | 3 ++- libs/vkd3d/device.c | 14 +++++++++----- libs/vkd3d/vkd3d.map | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index a683dca..ca0887c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -344,7 +344,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device))) return NULL; - vk_instance = vkd3d_get_vk_instance(d3d12_device); + vk_instance = vkd3d_get_vk_instance(vkd3d_instance_from_device(d3d12_device)); vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device); vk_device = vkd3d_get_vk_device(d3d12_device); diff --git a/include/vkd3d.h b/include/vkd3d.h index 78d5e2e..6017e1a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -67,6 +67,7 @@ struct vkd3d_device_create_info HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); +VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); @@ -75,8 +76,8 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); VkDevice vkd3d_get_vk_device(ID3D12Device *device); -VkInstance vkd3d_get_vk_instance(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); +struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d84c579..3255dd6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -289,6 +289,11 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) return refcount; } +VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance) +{ + return instance->vk_instance; +} + static void vkd3d_trace_physical_device(VkPhysicalDevice device, const struct vkd3d_vk_instance_procs *vk_procs) { @@ -2076,17 +2081,16 @@ VkDevice vkd3d_get_vk_device(ID3D12Device *device) return d3d12_device->vk_device; } -VkInstance vkd3d_get_vk_instance(ID3D12Device *device) +VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); - struct vkd3d_instance *instance = d3d12_device->vkd3d_instance; - return instance->vk_instance; + return d3d12_device->vk_physical_device; } -VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) +struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); - return d3d12_device->vk_physical_device; + return d3d12_device->vkd3d_instance; } diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 6f40841..c5157c6 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -12,6 +12,7 @@ global: vkd3d_get_vk_physical_device; vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; + vkd3d_instance_from_device; vkd3d_instance_incref; vkd3d_release_vk_queue; vkd3d_serialize_root_signature;

1 0

Józef Kucia : libs/vkd3d: Add simple format support restrictions.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: b0aa4ed434d9cbcb8b4bf1fce96e48914603d186 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0aa4ed434d9cbcb8b4bf1f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:08 2018 +0100 libs/vkd3d: Add simple format support restrictions. In the long term, we may need more complex format support filtering. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5cf2ecf..d84c579 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1230,6 +1230,30 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if &IID_ID3D12GraphicsCommandList, riid, command_list); } +/* Direct3D feature levels restrict which formats can be optionally supported. */ +static void vkd3d_restrict_format_support_for_feature_level( + D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +{ + static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = + { + {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) + { + if (blacklisted_format_features[i].Format == format->dxgi_format) + { + format_support->Support1 &= ~blacklisted_format_features[i].Support1; + format_support->Support2 &= ~blacklisted_format_features[i].Support2; + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1378,6 +1402,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; + vkd3d_restrict_format_support_for_feature_level(data, format); + return S_OK; }

1 0

Francois Gouget : testbot: Fix the CompareRecordGroups() documentation and variable names.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: 2ee6ee59d76c3935b1279977a4ff786b2deb7556 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ee6ee59d76c3935b127997… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:23:05 2018 +0100 testbot: Fix the CompareRecordGroups() documentation and variable names. The RecordGroup Id is an AUTO_INCREMENT field. These never wrap! Also, while that field is defined as an INT(6), it is a 32 bit integer anyway so we will not run out of ids for a long time. Generally speaking, for integers the display width (6 here) is meaningless as far as the TestBot is concerned. Also use more descriptive variable names. $a and $b were a bit misleading too since they have special meaning in the context of the sort() function, meaning which they don't have here. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/RecordGroups.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index fc1c252..707d0ac 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -95,12 +95,12 @@ sub CreateRecordGroups(;$) sub CompareRecordGroups($$) { - my ($a, $b) = @_; + my ($RecordGroup1, $RecordGroup2) = @_; - # The Id will wrap eventually so sort by Timestamp - # and only use the Id to break ties. - return $a->Timestamp <=> $b->Timestamp || - $a->Id <=> $b->Id; + # The Timestamps have a 1 second granularity and may have duplicates. + # So use the Id to break ties. + return $RecordGroup1->Timestamp <=> $RecordGroup2->Timestamp || + $RecordGroup1->Id <=> $RecordGroup2->Id; } =pod

1 0

Francois Gouget : testbot/Janitor: Don' t undefine variables that are going out of scope.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: ac81f268a30b068320468aca88d857924ab06e32 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac81f268a30b068320468ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:23:16 2018 +0100 testbot/Janitor: Don't undefine variables that are going out of scope. There is no point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4f0e4de..6ac22de 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -72,7 +72,6 @@ if ($JobPurgeDays != 0) } } } - $Jobs = undef; } # Delete PatchSets that are more than a day old @@ -123,7 +122,6 @@ if ($JobPurgeDays != 0) } } } - $Patches = undef; } # Archive old Jobs, that is remove all their associated files @@ -146,7 +144,6 @@ if ($JobArchiveDays != 0) $Job->Save(); } } - $Jobs = undef; } # Purge the deleted users and VMs if they are not referenced anymore @@ -286,5 +283,4 @@ if ($JobPurgeDays != 0) } } } - $RecordGroups = undef; }

1 0

Francois Gouget : testbot: Return the activity records as a sorted list.
by Alexandre Julliard 17 Jan '18

17 Jan '18

Module: tools Branch: master Commit: dfff27816fb06dadd5b07b94d64c5e7ef3096155 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dfff27816fb06dadd5b07b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 01:22:58 2018 +0100 testbot: Return the activity records as a sorted list. The callers need a sorted list rather than a random access structure. So this avoids forcing them to deal with sorting the activity records again and mildly speeds things up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++++--------------- testbot/web/Activity.pl | 4 ++-- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5a5d232..58169ae 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -44,9 +44,13 @@ require Exporter; =item C<GetActivity()> Loads the records for the specified VMs and processes them to build a structure -describing the TestBot activity. The structure is as follows: +describing the TestBot activity. - { <GroupNo1> => { +Returns a list of the activity records, sorted from the oldest to the newest. +Each entry contains a structure grouping all the state and event information +for the specified timestamp. Entries have the following structure: + + { start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -78,12 +82,10 @@ describing the TestBot activity. The structure is as follows: ... }, }, - }, - <GroupNo2> => { - ... - }, - ... - } + } + +GetActivity() also returns a table with the number of records and record groups +that were processed. =back =cut @@ -91,14 +93,16 @@ describing the TestBot activity. The structure is as follows: sub GetActivity($) { my ($VMs) = @_; - my ($Activity, $Counters) = ({}, {}); + my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); - foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - $Activity->{$RecordGroup->Id} = { start => $RecordGroup->Timestamp }; + my $Group = { start => $RecordGroup->Timestamp }; + $ActivityHash->{$RecordGroup->Id} = $Group; + push @$Activity, $Group; } ### And then load all the Records in one go @@ -110,7 +114,7 @@ sub GetActivity($) $Counters->{records} = $Records->GetItemsCount(); foreach my $Record (@{$Records->GetItems()}) { - my $Group = $Activity->{$Record->RecordGroupId}; + my $Group = $ActivityHash->{$Record->RecordGroupId}; if ($Record->Type eq "tasks" and $Record->Name eq "counters") { ($Group->{runnable}, $Group->{queued}) = split / /, $Record->Value; @@ -196,9 +200,8 @@ sub GetActivity($) ### Fill the holes in the table, compute end times, etc. my ($LastGroup, %LastStatusVMs); - foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) + foreach my $Group (@$Activity) { - my $Group = $Activity->{$RecordGroup->Id}; my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; next if (!$StatusVMs and !$ResultVMs); @@ -380,7 +383,7 @@ sub GetStatistics($) my ($Activity, $Counters) = GetActivity($VMs); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; - foreach my $Group (values %$Activity) + foreach my $Group (@$Activity) { if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) { diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a730df..f8b7b5a 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -133,9 +133,9 @@ EOF print "<tbody>\n"; my ($Activity, $_Counters) = GetActivity($VMs); - foreach my $GroupNo (sort { $b <=> $a } keys %$Activity) + for (my $Index = @$Activity; $Index--; ) { - my $Group = $Activity->{$GroupNo}; + my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>";

1 0

Józef Kucia : libs/vkd3d: Allow library user to select Vulkan physical device.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: ae014a29c445ed887e3c85a5f4fa98dae81c7c49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae014a29c445ed887e3c85a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:27 2018 +0100 libs/vkd3d: Allow library user to select Vulkan physical device. 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 | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 1 + libs/vkd3d/device.c | 21 +++++++++++---------- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index a70bd2d..78d5e2e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -57,6 +57,8 @@ struct vkd3d_device_create_info struct vkd3d_instance *instance; const struct vkd3d_instance_create_info *instance_create_info; + + VkPhysicalDevice vk_physical_device; }; /* resource flags */ diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 38283bf..9fe61a1 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -45,6 +45,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = NULL; device_create_info.instance_create_info = &instance_create_info; + device_create_info.vk_physical_device = VK_NULL_HANDLE; return vkd3d_create_device(&device_create_info, riid, device); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1e40e5d..5cf2ecf 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -740,16 +740,15 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, return S_OK; } -static HRESULT vkd3d_create_vk_device(struct d3d12_device *device) +static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDevice physical_device) { - unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; uint32_t direct_queue_timestamp_bits, copy_queue_timestamp_bits, compute_queue_timestamp_bits; + unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; const char *extensions[MAX_DEVICE_EXTENSION_COUNT]; VkQueueFamilyProperties *queue_properties; VkPhysicalDeviceFeatures device_features; VkDeviceQueueCreateInfo *queue_info; - VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; VkDevice vk_device; @@ -757,10 +756,10 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device) VkResult vr; HRESULT hr; - TRACE("device %p.\n", device); + TRACE("device %p, physical_device %p.\n", device, physical_device); - physical_device = VK_NULL_HANDLE; - if (FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) + if (!physical_device + && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) return hr; /* Create command queues */ @@ -1976,7 +1975,8 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) return impl_from_ID3D12Device(iface); } -static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_instance *instance) +static HRESULT d3d12_device_init(struct d3d12_device *device, + struct vkd3d_instance *instance, VkPhysicalDevice vk_physical_device) { HRESULT hr; @@ -1990,7 +1990,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_insta device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; - if (FAILED(hr = vkd3d_create_vk_device(device))) + if (FAILED(hr = vkd3d_create_vk_device(device, vk_physical_device))) { vkd3d_instance_decref(device->vkd3d_instance); return hr; @@ -2021,7 +2021,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_insta return S_OK; } -HRESULT d3d12_device_create(struct vkd3d_instance *instance, struct d3d12_device **device) +HRESULT d3d12_device_create(struct vkd3d_instance *instance, + VkPhysicalDevice vk_physical_device, struct d3d12_device **device) { struct d3d12_device *object; HRESULT hr; @@ -2029,7 +2030,7 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, struct d3d12_device if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_device_init(object, instance))) + if (FAILED(hr = d3d12_device_init(object, instance, vk_physical_device))) { vkd3d_free(object); return hr; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 005e6bf..d3b0bf4 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -64,7 +64,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return E_FAIL; } - hr = d3d12_device_create(instance, &object); + hr = d3d12_device_create(instance, create_info->vk_physical_device, &object); vkd3d_instance_decref(instance); if (FAILED(hr)) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index de5ed8e..eca6895 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -658,7 +658,8 @@ struct d3d12_device vkd3d_join_thread_pfn join_thread; }; -HRESULT d3d12_device_create(struct vkd3d_instance *instance, struct d3d12_device **device) DECLSPEC_HIDDEN; +HRESULT d3d12_device_create(struct vkd3d_instance *instance, + VkPhysicalDevice vk_physical_device, struct d3d12_device **device) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device,

1 0

Józef Kucia : build: Fix distcheck.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 473ab501ef4c512fbf7b8a4967c9d8a17acfa7ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=473ab501ef4c512fbf7b8a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:26 2018 +0100 build: Fix distcheck. 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3ad9c2e..a99fa56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,8 +62,10 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ + include/vkd3d_shader.h \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/spirv.c \ + libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ @@ -72,17 +74,18 @@ libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vk endif libvkd3d_la_SOURCES = \ - include/d3d12.idl \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ include/private/vkd3d_test.h \ - include/unknown.idl \ + include/vkd3d_d3d12.idl \ + include/vkd3d_unknown.idl \ libs/vkd3d/command.c \ libs/vkd3d/device.c \ libs/vkd3d/resource.c \ libs/vkd3d/state.c \ libs/vkd3d/utils.c \ + libs/vkd3d/vkd3d.map \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h @@ -92,6 +95,7 @@ libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map endif libvkd3d_utils_la_SOURCES = \ + libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la

1 0

Józef Kucia : build: Add version name for symbols.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: a64dd8be5f7fc1f5b4af9a209dfee8cf7c508bde URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a64dd8be5f7fc1f5b4af9a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:25 2018 +0100 build: Add version name for symbols. 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-shader/vkd3d_shader.map | 1 + libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d/vkd3d.map | 1 + 3 files changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 31ee4a9..92e4d06 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -1,3 +1,4 @@ +VKD3D_1_0 { global: vkd3d_shader_compile_dxbc; diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 42df666..79858e5 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -1,3 +1,4 @@ +VKD3D_1_0 { global: D3D12CreateDevice; diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 0c0d768..6f40841 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -1,3 +1,4 @@ +VKD3D_1_0 { global: vkd3d_acquire_vk_queue;

1 0

Józef Kucia : tests: Fix copy-paste mistakes.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: vkd3d Branch: master Commit: 44aad2a938afe76dd9d3d8ebc1df585eb1b0e3a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44aad2a938afe76dd9d3d8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 16 14:02:24 2018 +0100 tests: Fix copy-paste mistakes. 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/vkd3d_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 146467a..7ca5d26 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -151,9 +151,9 @@ static void test_vkd3d_queue(void) direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); ok(direct_queue, "Failed to create direct command queue.\n"); compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE); - ok(compute_queue, "Failed to create direct command queue.\n"); + ok(compute_queue, "Failed to create compute command queue.\n"); copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY); - ok(copy_queue, "Failed to create direct command queue.\n"); + ok(copy_queue, "Failed to create copy command queue.\n"); vk_queue_family = vkd3d_get_vk_queue_family_index(direct_queue); trace("Direct queue family index %u.\n", vk_queue_family);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
64
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 January 2018