[packages/vulkan-sdk] - updated to 1.0.68.0 - updated system_glslang_and_spirv-tools,demos_out_of_src,x32,system_jsoncpp p
qboosh
qboosh at pld-linux.org
Sat Mar 3 21:57:40 CET 2018
commit 1010dc183e9131aa91b0c1ea27f2e48108401d12
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 3 22:00:03 2018 +0100
- updated to 1.0.68.0
- updated system_glslang_and_spirv-tools,demos_out_of_src,x32,system_jsoncpp patches
- removed outdated always_xcb,install patches
- added c++ patch (missing <sstream> include for std::stringstream)
always_xcb.patch | 11 --
demos_out_of_src.patch | 39 ++++---
system_glslang_and_spirv-tools.patch | 62 +++++-----
system_jsoncpp.patch | 67 +++++++----
vulkan-sdk-c++.patch | 10 ++
vulkan-sdk-install.patch | 20 ----
vulkan-sdk.spec | 215 +++++++++++++++++------------------
x32.patch | 9 +-
8 files changed, 216 insertions(+), 217 deletions(-)
---
diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index da83027..1835ef5 100644
--- a/vulkan-sdk.spec
+++ b/vulkan-sdk.spec
@@ -9,24 +9,27 @@
%bcond_without wayland # Wayland support in loader
%bcond_without x11 # XLib support in loader
-%define api_version 1.0.39
+%define api_version 1.0.68
+# see submodules/Vulkan-LoaderAndValidationLayers in git
+%define lvl_rev 65c23aec1365c0a727323af6f331b0773b4fc1de
Summary: LunarG Vulkan SDK
Summary(pl.UTF-8): Pakiet programistyczny (SDK) LunarG Vulkan
Name: vulkan-sdk
-Version: 1.0.39.1
-Release: 2
+Version: 1.0.68.0
+Release: 1
License: Apache v2.0, parts MIT-like
Group: Development
Source0: https://github.com/LunarG/VulkanTools/archive/sdk-%{version}/VulkanTools-%{version}.tar.gz
-# Source0-md5: 62446dfd61208771d39109218cb29152
+# Source0-md5: 34f9b94a9c698bd6f62d1a0b8c1cc1bc
+Source1: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/%{lvl_rev}/Vulkan-LoaderAndValidationLayers-%{lvl_rev}.tar.gz
+# Source1-md5: 6da35fb1d4ba687e1d67c39aaa474c4b
Patch0: system_glslang_and_spirv-tools.patch
Patch1: demos_out_of_src.patch
Patch2: rpath.patch
-Patch3: always_xcb.patch
+Patch3: %{name}-c++.patch
Patch4: x32.patch
Patch5: system_jsoncpp.patch
-Patch6: %{name}-install.patch
URL: http://lunarg.com/vulkan-sdk/
BuildRequires: GLM
BuildRequires: Qt5Core-devel >= 5
@@ -38,8 +41,8 @@ BuildRequires: cmake >= 3.0
%if %{with tests} && %(locale -a | grep -q '^C\.UTF-8$'; echo $?)
BuildRequires: glibc-localedb-all
%endif
-BuildRequires: glslang >= 3.0.s20161222
-BuildRequires: glslang-devel >= 3.0.s20161222
+BuildRequires: glslang >= 3.0.s20180205
+BuildRequires: glslang-devel >= 3.0.s20180205
BuildRequires: graphviz
BuildRequires: ImageMagick-devel
BuildRequires: jsoncpp-devel
@@ -52,12 +55,12 @@ BuildRequires: python3 >= 3
BuildRequires: python3-lxml
BuildRequires: python3-modules >= 3
BuildRequires: qt5-build >= 5
-BuildRequires: spirv-tools-devel >= v2016.7
+BuildRequires: spirv-tools-devel >= v2018.1-0.s20180210
BuildRequires: udev-devel
%{?with_wayland:BuildRequires: wayland-devel}
%{?with_x11:BuildRequires: xorg-lib-libX11-devel}
-Requires: glslang >= 3.0.s20161222
-Requires: spirv-tools >= v2016.7
+Requires: glslang >= 3.0.s20180205
+Requires: spirv-tools >= v2018.1-0.s20180210
Requires: %{name}-debug-layers = %{version}-%{release}
Requires: vulkan-devel = %{version}-%{release}
Requires: vulkan-loader = %{version}-%{release}
@@ -89,30 +92,6 @@ Common loader for Vulkan API drivers.
%description -n vulkan-loader -l pl.UTF-8
Wspólna biblioteka wczytująca sterowniki Vulkan.
-%package validation-layers
-Summary: Validation layers for Vulkan
-Summary(pl.UTF-8): Warstwy sprawdzania poprawności dla Vulkana
-Group: Development/Libraries
-Requires: vulkan-loader = %{version}-%{release}
-
-%description validation-layers
-Validation layers for Vulkan.
-
-%description validation-layers -l pl.UTF-8
-Warstwy sprawdzania poprawności dla Vulkana.
-
-%package debug-layers
-Summary: Debug layers for Vulkan
-Summary(pl.UTF-8): Warstwy diagnostyczne dla Vulkana
-Group: Development/Libraries
-Requires: vulkan-loader = %{version}-%{release}
-
-%description debug-layers
-Debug layers for Vulkan.
-
-%description debug-layers -l pl.UTF-8
-Warstwy diagnostyczne dla Vulkana.
-
%package -n vulkan-devel
Summary: Header files for the Vulkan API
Summary(pl.UTF-8): Pliki nagłówkowe API Vulkan
@@ -125,19 +104,6 @@ Header files for the Vulkan API.
%description -n vulkan-devel -l pl.UTF-8
Pliki nagłówkowe API Vulkan.
-%package demos
-Summary: Vulkan demos
-Summary(pl.UTF-8): Programy demonstracyjne Vulkana
-Group: Development/Libraries
-Requires: vulkan(icd)
-Requires: vulkan-loader = %{version}-%{release}
-
-%description demos
-Vulkan demos.
-
-%description demos -l pl.UTF-8
-Programy demonstracyjne Vulkana.
-
%package tools
Summary: Vulkan tools
Summary(pl.UTF-8): Narzędzia Vulkana
@@ -163,15 +129,59 @@ Vulkan trace viewer.
%description tools-vktraceviewer -l pl.UTF-8
Przeglądarka śladów Vulkana.
+%package validation-layers
+Summary: Validation layers for Vulkan
+Summary(pl.UTF-8): Warstwy sprawdzania poprawności dla Vulkana
+Group: Development/Libraries
+Requires: vulkan-loader = %{version}-%{release}
+
+%description validation-layers
+Validation layers for Vulkan.
+
+%description validation-layers -l pl.UTF-8
+Warstwy sprawdzania poprawności dla Vulkana.
+
+%package debug-layers
+Summary: Debug layers for Vulkan
+Summary(pl.UTF-8): Warstwy diagnostyczne dla Vulkana
+Group: Development/Libraries
+Requires: vulkan-loader = %{version}-%{release}
+
+%description debug-layers
+Debug layers for Vulkan.
+
+%description debug-layers -l pl.UTF-8
+Warstwy diagnostyczne dla Vulkana.
+
+%package demos
+Summary: Vulkan demos
+Summary(pl.UTF-8): Programy demonstracyjne Vulkana
+Group: Development/Libraries
+Requires: vulkan(icd)
+Requires: vulkan-loader = %{version}-%{release}
+
+%description demos
+Vulkan demos.
+
+%description demos -l pl.UTF-8
+Programy demonstracyjne Vulkana.
+
%prep
%setup -qn VulkanTools-sdk-%{version}
+%{__tar} xzf %{SOURCE1} -C submodules/Vulkan-LoaderAndValidationLayers --strip-components=1
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
+
+find . -name '*.orig' | xargs -r rm -f
+
+install -d submodules/Vulkan-LoaderAndValidationLayers/external/glslang/External/spirv-tools
+# spirv-tools commit ID
+echo '1d7b1423f939027da9a9524765a36fa71be265cd' > submodules/Vulkan-LoaderAndValidationLayers/external/glslang/External/spirv-tools/.git_rev
%build
install -d build
@@ -179,7 +189,6 @@ cd build
%cmake .. \
-DJSONCPP_INCLUDE_DIR=/usr/include/jsoncpp \
- -DJSONCPP_SOURCE_DIR=/usr/include/jsoncpp \
-DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
-DBUILD_WSI_MIR_SUPPORT=%{?with_mir:ON}%{!?with_mir:OFF} \
-DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
@@ -208,35 +217,28 @@ install -d $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/vulkan/icd.d \
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-install build/demos/cube $RPM_BUILD_ROOT%{_bindir}/vulkan-cube
-install build/demos/smoketest $RPM_BUILD_ROOT%{_bindir}/vulkan-smoketest
-cp -p build/demos/{lunarg.ppm,*-vert.spv,*-frag.spv} $RPM_BUILD_ROOT%{_datadir}/%{name}-demos
+install build/submodules/Vulkan-LoaderAndValidationLayers/demos/cube $RPM_BUILD_ROOT%{_bindir}/vulkan-cube
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{smoketest,vulkan-smoketest}
+cp -p build/submodules/Vulkan-LoaderAndValidationLayers/demos/lunarg.ppm $RPM_BUILD_ROOT%{_datadir}/%{name}-demos
%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/explicit_layer.d/* $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d
+%if "%{binsuf}" != ""
+sed -i -e's at libVkLayer_vktrace_layer.so@libVkLayer_vktrace_layer%{binsuf}.so@' \
+ $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/{VkLayer_vktrace_layer,VkLayer_vktrace_layer%{binsuf}}.json
+%endif
-install build/libs/vkjson/vkjson_{info,unittest} $RPM_BUILD_ROOT%{_bindir}
-cp -p build/libs/vkjson/libvkjson.a $RPM_BUILD_ROOT%{_libdir}
-cp -p libs/vkjson/vkjson.h $RPM_BUILD_ROOT%{_includedir}
-
-for f in build/layersvt/*.json ; do
- sed -e's@"library_path": "./@"library_path": "@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/$(basename $f)
-done
+install build/submodules/Vulkan-LoaderAndValidationLayers/libs/vkjson/vkjson_{info,unittest} $RPM_BUILD_ROOT%{_bindir}
+cp -p build/submodules/Vulkan-LoaderAndValidationLayers/libs/vkjson/libvkjson.a $RPM_BUILD_ROOT%{_libdir}
+cp -p submodules/Vulkan-LoaderAndValidationLayers/libs/vkjson/vkjson.h $RPM_BUILD_ROOT%{_includedir}
-cp -pr demos/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr submodules/Vulkan-LoaderAndValidationLayers/demos/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/{android,*.user,smoke/android}
-install build/vktrace/libVkLayer_vktrace_layer%{binsuf}.so $RPM_BUILD_ROOT%{_libdir}
-install build/vktrace/vkreplay%{binsuf} $RPM_BUILD_ROOT%{_bindir}
-install build/vktrace/vktrace%{binsuf} $RPM_BUILD_ROOT%{_bindir}
install build/vktrace/vktraceviewer%{binsuf} $RPM_BUILD_ROOT%{_bindir}
-%if "%{binsuf}" != ""
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
-%endif
-sed -e's@"library_path": "../vktrace/@"library_path": "@' \
- -e's at libVkLayer_vktrace_layer.so@libVkLayer_vktrace_layer%{binsuf}.so@' \
- build/layersvt/VkLayer_vktrace_layer.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer%{binsuf}.json
-
-install build/via/via $RPM_BUILD_ROOT%{_bindir}
+cp -p via/README.md via-README.md
+cp -p vktrace/LICENSE vktrace-LICENSE
cp -p vktrace/README.md vktrace-README.md
cp -p vktrace/TODO.md vktrace-TODO.md
@@ -251,8 +253,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n vulkan-loader
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt
-%doc loader/{README.md,LoaderAndLayerInterface.md}
+%doc submodules/Vulkan-LoaderAndValidationLayers/{COPYRIGHT.txt,README.md,loader/LoaderAndLayerInterface.md}
%dir %{_sysconfdir}/vulkan
%dir %{_sysconfdir}/vulkan/icd.d
%dir %{_sysconfdir}/vulkan/explicit_layer.d
@@ -264,78 +265,68 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libvulkan.so.1.*.*
%attr(755,root,root) %ghost %{_libdir}/libvulkan.so.1
-%files demos
+%files -n vulkan-devel
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt
-%attr(755,root,root) %{_bindir}/vulkan-cube
-%attr(755,root,root) %{_bindir}/vulkan-smoketest
-%{_datadir}/%{name}-demos
+%attr(755,root,root) %{_libdir}/libvulkan.so
+%{_libdir}/libvkjson.a
+%{_includedir}/vulkan
+%{_includedir}/vkjson.h
+%{_pkgconfigdir}/vulkan.pc
+%{_examplesdir}/%{name}-%{version}
%files tools
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt
-%doc vktrace-README.md vktrace-TODO.md
+%doc COPYRIGHT.txt README.md via-README.md vktrace-{LICENSE,README.md,TODO.md}
%attr(755,root,root) %{_bindir}/via
%attr(755,root,root) %{_bindir}/vkjson_info
%attr(755,root,root) %{_bindir}/vkjson_unittest
%attr(755,root,root) %{_bindir}/vulkaninfo
-%ifarch %{x8664}
-%attr(755,root,root) %{_bindir}/vkreplay
-%attr(755,root,root) %{_bindir}/vktrace
-%attr(755,root,root) %{_libdir}/libVkLayer_vktrace_layer.so
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
-%else
-%attr(755,root,root) %{_bindir}/vkreplay32
-%attr(755,root,root) %{_bindir}/vktrace32
-%attr(755,root,root) %{_libdir}/libVkLayer_vktrace_layer32.so
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer32.json
-%endif
+%attr(755,root,root) %{_bindir}/vkreplay%{binsuf}
+%attr(755,root,root) %{_bindir}/vktrace%{binsuf}
+%attr(755,root,root) %{_libdir}/libVkLayer_vktrace_layer%{binsuf}.so
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer%{binsuf}.json
%files tools-vktraceviewer
%defattr(644,root,root,755)
-%ifarch %{x8664}
-%attr(755,root,root) %{_bindir}/vktraceviewer
-%else
-%attr(755,root,root) %{_bindir}/vktraceviewer32
-%endif
+%attr(755,root,root) %{_bindir}/vktraceviewer%{binsuf}
%files validation-layers
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt
-%doc layers/{README.md,vk_layer_settings.txt}
+%doc submodules/Vulkan-LoaderAndValidationLayers/layers/{README.md,vk_layer_settings.txt}
%attr(755,root,root) %{_libdir}/libVkLayer_core_validation.so
-%attr(755,root,root) %{_libdir}/libVkLayer_image.so
%attr(755,root,root) %{_libdir}/libVkLayer_object_tracker.so
%attr(755,root,root) %{_libdir}/libVkLayer_parameter_validation.so
-%attr(755,root,root) %{_libdir}/libVkLayer_swapchain.so
%attr(755,root,root) %{_libdir}/libVkLayer_threading.so
%attr(755,root,root) %{_libdir}/libVkLayer_unique_objects.so
%attr(755,root,root) %{_libdir}/libVkLayer_utils.so
%{_datadir}/vulkan/explicit_layer.d/VkLayer_core_validation.json
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_image.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_object_tracker.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_swapchain.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_standard_validation.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_threading.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_unique_objects.json
%files debug-layers
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt
%doc layersvt/{README.md,vk_layer_settings.txt}
%attr(755,root,root) %{_libdir}/libVkLayer_api_dump.so
+%attr(755,root,root) %{_libdir}/libVkLayer_assistant_layer.so
+%attr(755,root,root) %{_libdir}/libVkLayer_demo_layer.so
+%attr(755,root,root) %{_libdir}/libVkLayer_device_simulation.so
%attr(755,root,root) %{_libdir}/libVkLayer_monitor.so
%attr(755,root,root) %{_libdir}/libVkLayer_screenshot.so
-%attr(755,root,root) %{_libdir}/libVkLayer_utilsvt.so
+%attr(755,root,root) %{_libdir}/libVkLayer_starter_layer.so
%{_datadir}/vulkan/explicit_layer.d/VkLayer_api_dump.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_assistant_layer.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_demo_layer.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_device_simulation.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_monitor.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_screenshot.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_starter_layer.json
-%files -n vulkan-devel
+%files demos
%defattr(644,root,root,755)
-%doc COPYRIGHT.txt LICENSE.txt README.md
-%attr(755,root,root) %{_libdir}/libvulkan.so
-%{_libdir}/libvkjson.a
-%{_includedir}/vulkan
-%{_includedir}/vkjson.h
-%{_examplesdir}/%{name}-%{version}
+%doc submodules/Vulkan-LoaderAndValidationLayers/demos/smoke/README.md
+%attr(755,root,root) %{_bindir}/vulkan-cube
+%attr(755,root,root) %{_bindir}/vulkan-smoketest
+%{_datadir}/%{name}-demos
diff --git a/always_xcb.patch b/always_xcb.patch
deleted file mode 100644
index 836378c..0000000
--- a/always_xcb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt VulkanTools-sdk-1.0.32.0/CMakeLists.txt
---- VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt 2016-11-23 14:19:14.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/CMakeLists.txt 2016-11-23 14:19:30.000000000 +0100
-@@ -186,6 +186,7 @@
- set (SPIRV_TOOLS_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source/${RELEASE_DECORATION}")
- set (SPIRV_TOOLS_DEBUG_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source/${DEBUG_DECORATION}")
- endif()
-+ set(DisplayServer Xcb)
- else()
- #non windows
- if(CUSTOM_GLSLANG_BIN_ROOT)
diff --git a/demos_out_of_src.patch b/demos_out_of_src.patch
index d03574e..34700e1 100644
--- a/demos_out_of_src.patch
+++ b/demos_out_of_src.patch
@@ -1,6 +1,5 @@
-diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/cube.c VulkanTools-sdk-1.0.32.0/demos/cube.c
---- VulkanTools-sdk-1.0.32.0.orig/demos/cube.c 2016-11-10 18:52:27.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/demos/cube.c 2016-11-23 14:16:34.000000000 +0100
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers.orig/demos/cube.c 2016-11-10 18:52:27.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/cube.c 2016-11-23 14:16:34.000000000 +0100
@@ -23,6 +23,12 @@
* Author: Tony Barbour <tony at LunarG.com>
*/
@@ -23,21 +22,27 @@ diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/cube.c VulkanTools-sdk
static int validation_error = 0;
-@@ -1662,7 +1664,7 @@
- void *vertShaderCode;
- size_t size;
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/cube.cpp.orig 2018-02-06 21:25:10.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/cube.cpp 2018-03-03 19:13:55.174053549 +0100
+@@ -18,6 +18,12 @@
+ * Author: Jeremy Hayes <jeremy at lunarg.com>
+ */
-- vertShaderCode = demo_read_spv("cube-vert.spv", &size);
-+ vertShaderCode = demo_read_spv(DEMO_DATA_DIR "cube-vert.spv", &size);
++#ifdef DATADIR
++#define DEMO_DATA_DIR DATADIR "/vulkan-sdk-demos/"
++#else
++#define DEMO_DATA_DIR
++#endif
++
+ #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR)
+ #include <X11/Xutil.h>
+ #elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
+@@ -88,7 +94,7 @@
+ int32_t tex_height{0};
+ };
- demo->vert_shader_module =
- demo_prepare_shader_module(demo, vertShaderCode, size);
-@@ -1687,7 +1689,7 @@
- void *fragShaderCode;
- size_t size;
+-static char const *const tex_files[] = {"lunarg.ppm"};
++static char const *const tex_files[] = {DEMO_DATA_DIR "lunarg.ppm"};
-- fragShaderCode = demo_read_spv("cube-frag.spv", &size);
-+ fragShaderCode = demo_read_spv(DEMO_DATA_DIR "cube-frag.spv", &size);
+ static int validation_error = 0;
- demo->frag_shader_module =
- demo_prepare_shader_module(demo, fragShaderCode, size);
diff --git a/system_glslang_and_spirv-tools.patch b/system_glslang_and_spirv-tools.patch
index b02eb64..b598764 100644
--- a/system_glslang_and_spirv-tools.patch
+++ b/system_glslang_and_spirv-tools.patch
@@ -1,51 +1,54 @@
-diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt VulkanTools-sdk-1.0.32.0/CMakeLists.txt
---- VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt 2016-11-10 18:52:27.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/CMakeLists.txt 2016-11-23 14:15:38.000000000 +0100
-@@ -189,7 +189,7 @@
- else()
- #non windows
- if(CUSTOM_GLSLANG_BIN_ROOT)
-- set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
-+ set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
- "${GLSLANG_BINARY_ROOT}/glslang"
- "${GLSLANG_BINARY_ROOT}/glslang/OSDependent/Unix"
- "${GLSLANG_BINARY_ROOT}/OGLCompilersDLL"
-@@ -197,26 +197,27 @@
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt.orig 2018-03-03 15:42:14.740865232 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/CMakeLists.txt 2018-03-03 15:42:18.627531852 +0100
+@@ -199,28 +199,29 @@
"${GLSLANG_BINARY_ROOT}/hlsl"
"${GLSLANG_BINARY_ROOT}/StandAlone")
else()
- set (GLSLANG_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
-+ set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
++ set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
endif()
if(CUSTOM_SPIRV_TOOLS_BIN_ROOT)
set (SPIRV_TOOLS_SEARCH_PATH "${SPIRV_TOOLS_BINARY_ROOT}/source" )
+ set (SPIRV_TOOLS_OPT_SEARCH_PATH "${SPIRV_TOOLS_OPT_BINARY_ROOT}/source/opt" )
else()
-- set (SPIRV_TOOLS_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
-+ set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
+- set (SPIRV_TOOLS_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/External/spirv-tools/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
+- set (SPIRV_TOOLS_OPT_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/External/spirv-tools/source/opt" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
++ set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/External/spirv-tools/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
++ set (SPIRV_TOOLS_OPT_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/External/spirv-tools/source/opt" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
endif()
endif()
find_program(GLSLANG_VALIDATOR NAMES glslangValidator
-- HINTS "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
+- HINTS "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/bin"
+ HINTS "/usr/bin"
-+ "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
++ "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/bin"
"${GLSLANG_BINARY_ROOT}/StandAlone"
"${PROJECT_SOURCE_DIR}/external/${BINDATA_DIR}")
-find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${EXTERNAL_SOURCE_ROOT}/glslang"
-+find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include/glslang" "${EXTERNAL_SOURCE_ROOT}/glslang"
++find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include" "${EXTERNAL_SOURCE_ROOT}/glslang"
"${CMAKE_SOURCE_DIR}/../glslang"
DOC "Path to SPIRV/spirv.hpp")
--find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
-+find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
- "${EXTERNAL_SOURCE_ROOT}/SPIRV-Tools/include"
- "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
- "${CMAKE_SOURCE_DIR}/../SPIRV-Tools/include"
-diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt VulkanTools-sdk-1.0.32.0/demos/smoke/CMakeLists.txt
---- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt 2016-11-10 18:52:27.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/demos/smoke/CMakeLists.txt 2016-11-23 14:15:38.000000000 +0100
+-find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools/include"
++find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include" "${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools/include"
+ "${CMAKE_SOURCE_DIR}/../glslang/External/spirv-tools/include"
+ DOC "Path to spirv-tools/libspirv.h")
+
+@@ -325,8 +326,8 @@
+ # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of
+ # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the
+ # subsequent line (to ensure that the script is re-run when the revision file is modified).
+- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output}
+- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index
++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/.git_rev -s ${symbol_name} -o ${output}
++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git_rev
+ )
+ endmacro()
+
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/smoke/CMakeLists.txt.orig 2016-11-10 18:52:27.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/smoke/CMakeLists.txt 2016-11-23 14:15:38.000000000 +0100
@@ -10,7 +10,7 @@
macro(glsl_to_spirv src)
add_custom_command(OUTPUT ${src}.h
@@ -55,9 +58,8 @@ diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt V
)
endmacro()
-diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/smoke/glsl-to-spirv VulkanTools-sdk-1.0.32.0/demos/smoke/glsl-to-spirv
---- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/glsl-to-spirv 2016-11-10 18:52:27.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/demos/smoke/glsl-to-spirv 2016-11-23 14:15:38.000000000 +0100
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/smoke/glsl-to-spirv.orig 2016-11-10 18:52:27.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/demos/smoke/glsl-to-spirv 2016-11-23 14:15:38.000000000 +0100
@@ -32,7 +32,7 @@
in_filename = sys.argv[1]
out_filename = sys.argv[2] if len(sys.argv) > 2 else None
diff --git a/system_jsoncpp.patch b/system_jsoncpp.patch
index 9ca1764..bbbaabc 100644
--- a/system_jsoncpp.patch
+++ b/system_jsoncpp.patch
@@ -1,29 +1,27 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' VulkanTools-sdk-1.0.39.1.orig/CMakeLists.txt VulkanTools-sdk-1.0.39.1/CMakeLists.txt
---- VulkanTools-sdk-1.0.39.1.orig/CMakeLists.txt 2017-04-03 10:45:27.000000000 +0200
-+++ VulkanTools-sdk-1.0.39.1/CMakeLists.txt 2017-04-03 10:49:00.000000000 +0200
-@@ -200,20 +200,9 @@
- "${EXTERNAL_SOURCE_ROOT}/source/spirv-tools/external/include"
- DOC "Path to spirv-tools/libspirv.h")
-
--find_path(JSONCPP_INCLUDE_DIR json/json.h HINTS "${EXTERNAL_SOURCE_ROOT}/jsoncpp/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JsonCpp/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JsonCPP/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JSONCPP/dist"
-- "${CMAKE_SOURCE_DIR}/../jsoncpp/dist"
-+find_path(JSONCPP_INCLUDE_DIR json/json.h HINTS "/usr/include/jsoncpp"
- DOC "Path to jsoncpp/dist/json/json.h")
+--- VulkanTools-sdk-1.0.68.0/CMakeLists.txt.orig 2018-03-03 13:20:34.570962288 +0100
++++ VulkanTools-sdk-1.0.68.0/CMakeLists.txt 2018-03-03 13:22:08.357627883 +0100
+@@ -127,19 +127,8 @@
+ # Define a variable for a default root location to the gslang, SPIRV-Tools and other external sources and cache it to allow the user to customize it as needed
+ set(SUBPROJECT_SOURCE_ROOT ${V_LVL_ROOT_DIR}/submodules CACHE STRING "Root path to VulkanTools submodule repositories")
--find_path(JSONCPP_SOURCE_DIR jsoncpp.cpp HINTS "${EXTERNAL_SOURCE_ROOT}/jsoncpp/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JsonCpp/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JsonCPP/dist"
-- "${EXTERNAL_SOURCE_ROOT}/JSONCPP/dist"
+-find_path(JSONCPP_INCLUDE_DIR json/json.h HINTS "${SUBPROJECTS_DIR}/jsoncpp/dist"
+- "${SUBPROJECTS_DIR}/JsonCpp/dist"
+- "${SUBPROJECTS_DIR}/JsonCPP/dist"
+- "${SUBPROJECTS_DIR}/JSONCPP/dist"
- "${CMAKE_SOURCE_DIR}/../jsoncpp/dist"
-- DOC "Path to jsoncpp/dist/json.cpp")
+- DOC "Path to jsoncpp/dist/json/json.h")
-
- find_library(GLSLANG_LIB NAMES glslang
- HINTS ${GLSLANG_SEARCH_PATH} )
+-find_path(JSONCPP_SOURCE_DIR jsoncpp.cpp HINTS "${SUBPROJECTS_DIR}/jsoncpp/dist"
+- "${SUBPROJECTS_DIR}/JsonCpp/dist"
+- "${SUBPROJECTS_DIR}/JsonCPP/dist"
+- "${SUBPROJECTS_DIR}/JSONCPP/dist"
+- "${CMAKE_SOURCE_DIR}/../jsoncpp/dist"
+- DOC "Path to jsoncpp/dist/json.cpp")
++find_path(JSONCPP_INCLUDE_DIR json/json.h HINTS "/usr/include/jsoncpp"
++ DOC "Path to jsoncpp/dist/json/json.h")
+
+ find_library(JSONCPP_LIB NAMES jsoncpp HINTS ${JSONCPP_SEARCH_PATH} )
-diff -dur -x '*~' -x '*.orig' -x '*.rej' VulkanTools-sdk-1.0.39.1.orig/via/CMakeLists.txt VulkanTools-sdk-1.0.39.1/via/CMakeLists.txt
--- VulkanTools-sdk-1.0.39.1.orig/via/CMakeLists.txt 2017-02-03 00:57:55.000000000 +0100
+++ VulkanTools-sdk-1.0.39.1/via/CMakeLists.txt 2017-04-03 10:47:42.000000000 +0200
@@ -60,9 +60,9 @@
@@ -38,3 +36,28 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' VulkanTools-sdk-1.0.39.1.orig/via/CMake
if(WIN32)
target_link_libraries(via version)
endif()
+--- VulkanTools-sdk-1.0.68.0/via/CMakeLists-SDK.txt.orig 2018-02-07 18:36:10.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/via/CMakeLists-SDK.txt 2018-03-03 13:54:26.184272423 +0100
+@@ -78,9 +78,9 @@
+ include_directories(${VK_INC_DIR})
+ endif()
+
+-add_executable(via via.cpp ${JSONCPP_SOURCE_DIR}/jsoncpp.cpp)
++add_executable(via via.cpp)
+ target_include_directories(via PUBLIC ${JSONCPP_INCLUDE_DIR})
+-target_link_libraries(via ${LIBRARIES})
++target_link_libraries(via jsoncpp ${LIBRARIES})
+ if(WIN32)
+ target_link_libraries(via version)
+ endif()
+--- VulkanTools-sdk-1.0.68.0/layersvt/CMakeLists.txt.orig 2018-03-03 13:26:18.177625031 +0100
++++ VulkanTools-sdk-1.0.68.0/layersvt/CMakeLists.txt 2018-03-03 13:51:28.387607788 +0100
+@@ -167,6 +167,7 @@
+
+ add_vk_layer(monitor monitor.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp)
+ add_vk_layer(screenshot screenshot.cpp screenshot_parsing.h screenshot_parsing.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp)
+-add_vk_layer(device_simulation device_simulation.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp ${JSONCPP_SOURCE_DIR}/jsoncpp.cpp)
++add_vk_layer(device_simulation device_simulation.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp)
++target_link_Libraries(VkLayer_device_simulation jsoncpp)
+ add_vk_layer(api_dump api_dump.cpp ${V_LVL_ROOT_DIR}/layers/vk_layer_table.cpp)
+
diff --git a/vulkan-sdk-c++.patch b/vulkan-sdk-c++.patch
new file mode 100644
index 0000000..7b3fcd0
--- /dev/null
+++ b/vulkan-sdk-c++.patch
@@ -0,0 +1,10 @@
+--- VulkanTools-sdk-1.0.68.0/layersvt/device_simulation.cpp.orig 2018-02-07 18:36:10.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/layersvt/device_simulation.cpp 2018-03-03 18:48:31.184070949 +0100
+@@ -48,6 +48,7 @@
+ #include <vector>
+ #include <fstream>
+ #include <mutex>
++#include <sstream>
+
+ #include <json/json.h> // https://github.com/open-source-parsers/jsoncpp
+
diff --git a/vulkan-sdk-install.patch b/vulkan-sdk-install.patch
deleted file mode 100644
index ef47115..0000000
--- a/vulkan-sdk-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- VulkanTools-sdk-1.0.39.1/layersvt/CMakeLists.txt.orig 2017-05-27 08:25:39.348712996 +0200
-+++ VulkanTools-sdk-1.0.39.1/layersvt/CMakeLists.txt 2017-05-27 08:39:25.502036896 +0200
-@@ -105,7 +105,7 @@
- target_link_Libraries(VkLayer_${target} VkLayer_utilsvt)
- add_dependencies(VkLayer_${target} generate_vt_helpers generate_api_cpp generate_api_h)
- set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic")
-- install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging)
-+ install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endmacro()
- endif()
-
-@@ -166,7 +166,7 @@
- add_library(VkLayer_utilsvt STATIC ../layers/vk_layer_config.cpp ../layers/vk_layer_extension_utils.cpp ../layers/vk_layer_utils.cpp)
- else()
- add_library(VkLayer_utilsvt SHARED ../layers/vk_layer_config.cpp ../layers/vk_layer_extension_utils.cpp ../layers/vk_layer_utils.cpp)
-- install(TARGETS VkLayer_utilsvt DESTINATION ${PROJECT_BINARY_DIR}/install_staging)
-+ install(TARGETS VkLayer_utilsvt DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
- # VulkanTools layers
diff --git a/x32.patch b/x32.patch
index 39efc04..5282b6a 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,12 +1,11 @@
-diff -dur -x '*~' VulkanTools-sdk-1.0.32.0.orig/layers/threading.h VulkanTools-sdk-1.0.32.0/layers/threading.h
---- VulkanTools-sdk-1.0.32.0.orig/layers/threading.h 2016-11-10 18:52:27.000000000 +0100
-+++ VulkanTools-sdk-1.0.32.0/layers/threading.h 2016-11-23 15:54:32.000000000 +0100
+--- VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/layers/threading.h.orig 2018-03-03 17:41:37.340783448 +0100
++++ VulkanTools-sdk-1.0.68.0/submodules/Vulkan-LoaderAndValidationLayers/layers/threading.h 2018-03-03 18:26:50.374085800 +0100
@@ -26,7 +26,7 @@
#include "vk_layer_config.h"
#include "vk_layer_logging.h"
--#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || \
-+#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || \
+-#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || \
++#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || \
defined(__aarch64__) || defined(__powerpc64__)
// If pointers are 64-bit, then there can be separate counters for each
// NONDISPATCHABLE_HANDLE type. Otherwise they are all typedef uint64_t.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/1010dc183e9131aa91b0c1ea27f2e48108401d12
More information about the pld-cvs-commit
mailing list