January 2018 - Wine-commits

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 : 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 : 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

Francois Gouget : testbot: Document Item::OnDelete().
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: tools Branch: master Commit: 3dd26c762949946124ff73d1c207ced3956209f7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3dd26c762949946124ff73d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 16 04:02:09 2018 +0100 testbot: Document Item::OnDelete(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 88c9d1a..6296130 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -433,6 +433,25 @@ sub Validate($) return (undef, undef); } +=pod +=over 12 + +=item C<OnDelete()> + +Prepares the item for deletion. + +The default implementation deletes any related 'Detailref' object as these +have a foreign key referencing this Item, which would prevent its deletion. +This allows the deletion of Items even if the database does not support +'ON DELETE CASCADE'. To preserve this behavior OnDelete() implementations +should remove any other foreign key that would prevent the deletion of an Item. + +Returns undef if successful, or an error message if the Item should not be +deleted or something prevents its deletion. + +=back +=cut + sub OnDelete($) { my ($self) = @_;

1 0

Francois Gouget : winetest/gather: Remove support for obsolete statuses.
by Alexandre Julliard 16 Jan '18

16 Jan '18

Module: tools Branch: master Commit: 04404905e79325f5467dec0a7aa69536a459e248 URL: https://source.winehq.org/git/tools.git/?a=commit;h=04404905e79325f5467dec0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 16 04:05:25 2018 +0100 winetest/gather: Remove support for obsolete statuses. dissect is now responsible for detecting crashes and reporting them as 'failed crash' in the summary file. So gather no longer needs to assume negative exit codes identify crashes. 'failed -2' should not happen at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index fbf0397..ac6c350 100755 --- a/winetest/gather +++ b/winetest/gather @@ -633,8 +633,6 @@ sub get_result_title($$) if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } - if ($result->{status} eq "-2") { return "Test failed"; } - if ($result->{status} =~ /^-/) { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } return ""; } @@ -701,8 +699,6 @@ sub singletest($$$) { else { $msg = $status eq "crash" ? "crashed" : - $status eq "-2" ? "failed" : - $status =~ /^-/ ? "crashed" : $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title);

1 0

Julian Rüger : German translation for release 3.0-rc6
by Jeremy Newman 15 Jan '18

15 Jan '18

Module: website Branch: master Commit: be3b7caec8321824333d88c57c9dec0417ef5587 URL: https://source.winehq.org/git/website.git/?a=commit;h=be3b7caec8321824333d8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 15 17:12:59 2018 +0100 German translation for release 3.0-rc6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018011201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018011201.xml b/news/de/2018011201.xml new file mode 100644 index 0000000..792280f --- /dev/null +++ b/news/de/2018011201.xml @@ -0,0 +1,12 @@ +<news> +<date>12. Januar 2018</date> +<title>Wine 3.0-rc6 freigegeben</title> +<body> + Die Entwicklungsversion 3.0-rc6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Henri Verbeet : libs/vkd3d-shader: Validate the DXBC version.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 2d8e2fbe8699e96c5596fe44204b60ace363a0f8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d8e2fbe8699e96c5596fe4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 15 20:07:24 2018 +0330 libs/vkd3d-shader: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6aa2ffa..331b619 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1814,6 +1814,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -1828,7 +1829,13 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Józef Kucia : build: Use linker version scripts to control visibility.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 41715a2f33e1e73395e9b1be5effb42058a372c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41715a2f33e1e73395e9b1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:01 2018 +0100 build: Use linker version scripts to control visibility. 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 | 9 +++++++ configure.ac | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 14 +++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 13 +++++++++++ libs/vkd3d/vkd3d.map | 18 ++++++++++++++ m4/ld-version-script.m4 | 48 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2876f64..190a7ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,9 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map +endif libvkd3d_la_SOURCES = \ include/d3d12.idl \ @@ -85,11 +88,17 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @PTHREAD_LIBS@ @VULKAN_LIBS@ +if HAVE_LD_VERSION_SCRIPT +libvkd3d_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map +endif libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +if HAVE_LD_VERSION_SCRIPT +libvkd3d_utils_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map +endif EXTRA_DIST = LICENSE diff --git a/configure.ac b/configure.ac index 5614f79..b886058 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,8 @@ AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) LT_INIT +gl_LD_VERSION_SCRIPT + dnl Check compiler specific flags AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map new file mode 100644 index 0000000..31ee4a9 --- /dev/null +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -0,0 +1,14 @@ +{ +global: + vkd3d_shader_compile_dxbc; + vkd3d_shader_find_signature_element; + vkd3d_shader_free_root_signature; + vkd3d_shader_free_shader_code; + vkd3d_shader_free_shader_signature; + vkd3d_shader_parse_input_signature; + vkd3d_shader_parse_root_signature; + vkd3d_shader_scan_dxbc; + vkd3d_shader_serialize_root_signature; + +local: *; +}; diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map new file mode 100644 index 0000000..42df666 --- /dev/null +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -0,0 +1,13 @@ +{ +global: + D3D12CreateDevice; + D3D12CreateRootSignatureDeserializer; + D3D12GetDebugInterface; + D3D12SerializeRootSignature; + vkd3d_create_event; + vkd3d_destroy_event; + vkd3d_signal_event; + vkd3d_wait_event; + +local: *; +}; diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map new file mode 100644 index 0000000..db638f6 --- /dev/null +++ b/libs/vkd3d/vkd3d.map @@ -0,0 +1,18 @@ +{ +global: + vkd3d_create_device; + vkd3d_create_image_resource; + vkd3d_create_instance; + vkd3d_create_root_signature_deserializer; + vkd3d_get_vk_device; + vkd3d_get_vk_format; + vkd3d_get_vk_instance; + vkd3d_get_vk_physical_device; + vkd3d_get_vk_queue; + vkd3d_get_vk_queue_family_index; + vkd3d_instance_decref; + vkd3d_instance_incref; + vkd3d_serialize_root_signature; + +local: *; +}; diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 new file mode 100644 index 0000000..4364f9f --- /dev/null +++ b/m4/ld-version-script.m4 @@ -0,0 +1,48 @@ +# ld-version-script.m4 serial 4 +dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# FIXME: The test below returns a false positive for mingw +# cross-compiles, 'local:' statements does not reduce number of +# exported symbols in a DLL. Use --disable-ld-version-script to work +# around the problem. + +# gl_LD_VERSION_SCRIPT +# -------------------- +# Check if LD supports linker scripts, and define automake conditional +# HAVE_LD_VERSION_SCRIPT if so. +AC_DEFUN([gl_LD_VERSION_SCRIPT], +[ + AC_ARG_ENABLE([ld-version-script], + [AS_HELP_STRING([--enable-ld-version-script], + [enable linker version script (default is enabled when possible)])], + [have_ld_version_script=$enableval], + [AC_CACHE_CHECK([if LD -Wl,--version-script works], + [gl_cv_sys_ld_version_script], + [gl_cv_sys_ld_version_script=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" + echo foo >conftest.map + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [], + [cat > conftest.map <<EOF +VERS_1 { + global: sym; +}; + +VERS_2 { + global: sym; +} VERS_1; +EOF + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [gl_cv_sys_ld_version_script=yes])]) + rm -f conftest.map + LDFLAGS=$save_LDFLAGS]) + have_ld_version_script=$gl_cv_sys_ld_version_script]) + AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], + [test "$have_ld_version_script" = yes]) +])

1 0

Józef Kucia : build: Do not build libvkd3d-shader as public library.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: d51946d612bf98e3392d21e19de8adc15fbc891e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d51946d612bf98e3392d21e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:02 2018 +0100 build: Do not build libvkd3d-shader as public library. libvkd3d-shader interface is expected to be extended significantly. 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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 190a7ac..15a1783 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ vkd3d_public_headers = \ include/vkd3d_d3d12.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ - include/vkd3d_shader.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h @@ -49,13 +48,13 @@ vkd3d_demos_headers = \ BUILT_SOURCES = $(widl_headers) -noinst_LTLIBRARIES = libvkd3d-common.la +noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ libs/vkd3d-common/debug.c \ libs/vkd3d-common/memory.c -lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la +lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la libvkd3d_shader_la_SOURCES = \ include/private/list.h \ @@ -67,7 +66,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ +libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map endif @@ -110,7 +109,7 @@ EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c -vkd3d_compiler_LDADD = libvkd3d-shader.la +vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la LDADD = libvkd3d.la libvkd3d-utils.la check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)

1 0

Józef Kucia : build: Do not install vkd3d-compiler.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 15b918acd56705a392764c061ded980466fae60f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15b918acd56705a392764c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:03 2018 +0100 build: Do not install vkd3d-compiler. At this stage, vkd3d-compiler is useful only as an internal tool for testing. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15a1783..3ad9c2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,7 +107,7 @@ nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-utils.pc CLEANFILES = libvkd3d.pc libvkd3d-utils.pc EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in -bin_PROGRAMS = vkd3d-compiler +noinst_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la @@ -119,7 +119,7 @@ tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = @XCB_CFLAGS@ -noinst_PROGRAMS = $(vkd3d_demos) +noinst_PROGRAMS += $(vkd3d_demos) EXTRA_DIST += $(vkd3d_demos_headers) demos_gears_CFLAGS = $(DEMOS_CFLAGS)

1 0