[packages/vulkan-sdk] Version: 1.0.5.0 (current snapshot of the branch)
jajcus
jajcus at pld-linux.org
Sat Mar 12 21:08:56 CET 2016
commit 37fbe15cad369269923561d751cc62b031435102
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Mar 12 21:06:08 2016 +0100
Version: 1.0.5.0 (current snapshot of the branch)
Vulkan-LoaderAndValidationLayers now included in the VulkanTools
snapshot
wayland bcond disabled - upstream code builds XCB _or_ Wayland,
we need to patch this around for usable Wayland support.
demos_out_of_src.patch | 12 ++--
loader_repo_name.patch | 167 -------------------------------------------------
rpath.patch | 18 +-----
system_glslang.patch | 112 ++++++++++++++++-----------------
vulkan-sdk.spec | 129 ++++++++++++++++----------------------
5 files changed, 117 insertions(+), 321 deletions(-)
---
diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index 1f24a8f..08b1adc 100644
--- a/vulkan-sdk.spec
+++ b/vulkan-sdk.spec
@@ -1,63 +1,63 @@
#
+# TODO:
+# - update wayland patch so Wayland can be included together with XCB
+# again
+#
# Conditional build:
%bcond_with tests # build with tests (require a working Vulkan
# driver (ICD))
%bcond_with icd # build experimental Vulkan drivers
-%bcond_without wayland # disable Wayland support in loader
+%bcond_with wayland # enable Wayland support in loader
%ifnarch %{x8664}
%undefine with_icd
%endif
-%define api_version 1.0.3
+%define api_version 1.0.5
%define llvm_version 3.4.2
-%define snap 20160223
-# sdk-1.0.3 branch
-%define loader_commit b654da708be8f14e7f4c6f78df656229939422c8
-# master branch
-%define tools_commit e5dccf86cf999ff9988be97337d0e3a3d508b085
+%define snap 20160312
+# sdk-1.0.5 branch
+%define tools_commit f69ba448ea3a56f5104535636e27b8b8ab543455
# master branch
%define lg_commit 0a73713f0d664aa97a7e359f567a16d7c3fce359
%define rel 7
Summary: LunarG Vulkan SDK
Name: vulkan-sdk
-Version: 1.0.3.0
-Release: 3.s%{snap}.%{rel}
+Version: 1.0.5.0
+Release: 0.s%{snap}.%{rel}
License: MIT-like
Group: Development
-Source0: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/%{loader_commit}/Vulkan-LoaderAndValidationLayers-s%{snap}.tar.gz
-# Source0-md5: 25e8092b69d15090af5cada36d4fc92d
-Source1: https://github.com/LunarG/VulkanTools/archive/%{tools_commit}/VulkanTools-s%{snap}.tar.gz
-# Source1-md5: 89ae56a0c0270a7043548bc30c99aa36
-Source2: https://github.com/LunarG/LunarGLASS/archive/%{lg_commit}/LunarGLASS-%{snap}.tar.gz
-# Source2-md5: b0fb3253c782e1e539a5884dde8a31f8
-Source3: http://llvm.org/releases/%{llvm_version}/llvm-%{llvm_version}.src.tar.gz
-# Source3-md5: a20669f75967440de949ac3b1bad439c
+Source0: https://github.com/LunarG/VulkanTools/archive/%{tools_commit}/VulkanTools-s%{snap}.tar.gz
+# Source0-md5: dab7bc3a32918a3e124a379b338f9ed2
+Source1: https://github.com/LunarG/LunarGLASS/archive/%{lg_commit}/LunarGLASS-%{snap}.tar.gz
+# Source1-md5: b0fb3253c782e1e539a5884dde8a31f8
+Source2: http://llvm.org/releases/%{llvm_version}/llvm-%{llvm_version}.src.tar.gz
+# Source2-md5: a20669f75967440de949ac3b1bad439c
Patch0: system_glslang.patch
Patch1: LunarGLASS-CMakeLists.patch
Patch2: demos_out_of_src.patch
Patch3: rpath.patch
-Patch4: loader_repo_name.patch
-Patch5: wayland.patch
-Patch6: validation_swapchain_fence.patch
+Patch4: wayland.patch
URL: http://lunarg.com/vulkan-sdk/
%{?with_icd:BuildRequires: Mesa-libGL-devel}
BuildRequires: bison
%{?with_icd:BuildRequires: clang}
BuildRequires: cmake
BuildRequires: GLM
-BuildRequires: glslang
-BuildRequires: glslang-devel
+BuildRequires: glslang >= 3.0.s20160307
+BuildRequires: glslang-devel >= 3.0.s20160307
BuildRequires: graphviz
BuildRequires: ImageMagick-devel
BuildRequires: libpng
BuildRequires: libxcb-devel
BuildRequires: python3
BuildRequires: python3-modules
-BuildRequires: spirv-tools-devel
+BuildRequires: spirv-tools-devel >= 1.0_rev3.s20160312
BuildRequires: udev-devel
%{?with_icd:BuildRequires: xorg-lib-libpciaccess-devel}
+Requires: glslang >= 3.0.s20160307
+Requires: spirv-tools >= 1.0_rev3.s20160312
Requires: %{name}-debug-layers = %{version}-%{release}
Requires: vulkan-devel = %{version}-%{release}
Requires: vulkan-loader = %{version}-%{release}
@@ -127,7 +127,7 @@ Vulkan tools.
Summary: Experimental Vulkan driver for Intel GPUs
Group: X11/Libraries
Suggests: vulkan(loader)
-Provides: vulkan(icd) = 1.0.3
+Provides: vulkan(icd) = 1.0.5
%description icd-intel
Experimental Vulkan driver for Intel GPUs.
@@ -136,23 +136,20 @@ Experimental Vulkan driver for Intel GPUs.
Summary: Dummy Vulkan driver
Group: X11/Libraries
Suggests: vulkan(loader)
-Provides: vulkan(icd) = 1.0.3
+Provides: vulkan(icd) = 1.0.5
%description icd-nulldrv
Dummy Vulkan driver.
%prep
-%setup -q -c -a1 %{?with_icd:-a2}
+%setup -q -c %{?with_icd:-a1}
-mv Vulkan-LoaderAndValidationLayers-%{loader_commit} Vulkan-LoaderAndValidationLayers
mv VulkanTools-%{tools_commit} VulkanTools
%patch0 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch4 -p1
%if %{with icd}
mv LunarGLASS-%{lg_commit} LunarGLASS
@@ -165,24 +162,6 @@ cd ../../../..
%endif
%build
-install -d Vulkan-LoaderAndValidationLayers/build
-cd Vulkan-LoaderAndValidationLayers/build
-
-%cmake \
- -DCMAKE_INSTALL_DATADIR=share \
- -DCMAKE_INSTALL_SYSCONFDIR=etc \
- -DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
- -DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
- ../
-%{__make}
-
-%if %{with tests}
-cd tests
-LC_ALL=C.utf-8 VK_LAYER_PATH=../layers LD_LIBRARY_PATH=../loader:../layers ./run_all_tests.sh
-cd ..
-%endif
-
-cd ../..
%if %{with icd}
cd LunarGLASS/Core/LLVM/llvm-3.4
@@ -214,11 +193,22 @@ cd ../..
install -d VulkanTools/build
cd VulkanTools/build
+
%cmake \
+ -DCMAKE_INSTALL_DATADIR=share \
+ -DCMAKE_INSTALL_SYSCONFDIR=etc \
+ -DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
+ -DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
-DBUILD_ICD=%{?with_icd:ON}%{!?with_icd:OFF} \
- ../
-
+ ../
%{__make}
+
+%if %{with tests}
+cd tests
+LC_ALL=C.utf-8 VK_LAYER_PATH=../layers LD_LIBRARY_PATH=../loader:../layers ./run_all_tests.sh
+cd ..
+%endif
+
cd ../..
%install
@@ -231,16 +221,17 @@ $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/vulkan/{explicit,implicit}_layer.d \
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cd Vulkan-LoaderAndValidationLayers/build
+cd VulkanTools/build
%{__make} install
-cp -p loader/libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir}
-ln -s libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so
-ln -s libvulkan.so.1.0.3 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so.1
+cp -p loader/libvulkan.so.1.0.5 $RPM_BUILD_ROOT%{_libdir}
+ln -s libvulkan.so.1.0.5 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so
+ln -s libvulkan.so.1.0.5 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so.1
cp -p demos/vulkaninfo $RPM_BUILD_ROOT%{_bindir}/vulkaninfo
cp -p demos/tri $RPM_BUILD_ROOT%{_bindir}/vulkan-tri
cp -p demos/cube $RPM_BUILD_ROOT%{_bindir}/vulkan-cube
+cp -p demos/smoke/smoke $RPM_BUILD_ROOT%{_bindir}/vulkan-smoke
cp -p demos/{lunarg.ppm,*-vert.spv,*-frag.spv} $RPM_BUILD_ROOT%{_datadir}/%{name}-demos
cp -p install_staging/*.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer
@@ -254,25 +245,12 @@ cp -p libs/vkjson/vkjson_{info,unittest} $RPM_BUILD_ROOT%{_bindir}
cp -p ../libs/vkjson/vkjson.h $RPM_BUILD_ROOT%{_includedir}
cp -p ../include/vulkan/* $RPM_BUILD_ROOT%{_includedir}/vulkan
-cp -p ../demos/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr ../demos/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
# restore original demo sources in %{_examplesdir}
%patch2 -R -p3 -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*.orig 2>/dev/null || :
-cd ../..
-
-cd VulkanTools/build
-%{__make} install
-
-# liblayer_utils.so here overwrites the one from validation layers
-# do not install it! layers only
-cp -p install_staging/libVkLayer_*.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer
-
-for f in layers/*.json ; do
-sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/$(basename $f)
-done
-
%ifarch %x8664
cp -p vktrace/libVkLayer_vktrace_layer.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer
cp -p vktrace/vkreplay $RPM_BUILD_ROOT%{_bindir}
@@ -309,8 +287,8 @@ rm -rf $RPM_BUILD_ROOT
%files -n vulkan-loader
%defattr(644,root,root,755)
-%doc Vulkan-LoaderAndValidationLayers/LICENSE.txt
-%doc Vulkan-LoaderAndValidationLayers/loader/{README.md,LoaderAndLayerInterface.md}
+%doc VulkanTools/LICENSE.txt
+%doc VulkanTools/loader/{README.md,LoaderAndLayerInterface.md}
%dir %{_sysconfdir}/vulkan
%dir %{_sysconfdir}/vulkan/icd.d
%dir %{_sysconfdir}/vulkan/explicit_layer.d
@@ -326,9 +304,10 @@ rm -rf $RPM_BUILD_ROOT
%files demos
%defattr(644,root,root,755)
-%doc Vulkan-LoaderAndValidationLayers/LICENSE.txt
-%attr(755,root,root) %{_bindir}/vulkan-tri
+%doc VulkanTools/LICENSE.txt
%attr(755,root,root) %{_bindir}/vulkan-cube
+%attr(755,root,root) %{_bindir}/vulkan-smoke
+%attr(755,root,root) %{_bindir}/vulkan-tri
%{_datadir}/%{name}-demos
%files tools
@@ -352,8 +331,8 @@ rm -rf $RPM_BUILD_ROOT
%files validation-layers
%defattr(644,root,root,755)
-%doc Vulkan-LoaderAndValidationLayers/LICENSE.txt
-%doc Vulkan-LoaderAndValidationLayers/layers/{README.md,vk_layer_settings.txt}
+%doc VulkanTools/LICENSE.txt
+%doc VulkanTools/layers/{README.md,vk_layer_settings.txt}
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_device_limits.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_draw_state.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_image.so
@@ -391,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n vulkan-devel
%defattr(644,root,root,755)
-%doc Vulkan-LoaderAndValidationLayers/{LICENSE.txt,README.md}
+%doc VulkanTools/{LICENSE.txt,README.md}
%{_libdir}/libvulkan.so
%{_libdir}/libvkjson.a
%{_includedir}/vulkan
diff --git a/demos_out_of_src.patch b/demos_out_of_src.patch
index 45be00b..fb57dae 100644
--- a/demos_out_of_src.patch
+++ b/demos_out_of_src.patch
@@ -1,6 +1,6 @@
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/cube.c vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/cube.c
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/cube.c 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/cube.c 2016-02-25 08:15:38.000000000 +0100
+diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/cube.c vulkan-sdk-1.0.3.0/VulkanTools/demos/cube.c
+--- vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/cube.c 2016-02-22 22:02:54.000000000 +0100
++++ vulkan-sdk-1.0.3.0/VulkanTools/demos/cube.c 2016-02-25 08:15:38.000000000 +0100
@@ -28,6 +28,8 @@
* Author: Jon Ashburn <jon at lunarg.com>
*/
@@ -37,9 +37,9 @@ diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/cube.c
demo->frag_shader_module =
demo_prepare_shader_module(demo, fragShaderCode, size);
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/tri.c vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/tri.c
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/tri.c 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/tri.c 2016-02-25 08:14:22.000000000 +0100
+diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/tri.c vulkan-sdk-1.0.3.0/VulkanTools/demos/tri.c
+--- vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/tri.c 2016-02-22 22:02:54.000000000 +0100
++++ vulkan-sdk-1.0.3.0/VulkanTools/demos/tri.c 2016-02-25 08:14:22.000000000 +0100
@@ -35,6 +35,8 @@
* should. It also does no error checking.
*/
diff --git a/loader_repo_name.patch b/loader_repo_name.patch
deleted file mode 100644
index 7b130de..0000000
--- a/loader_repo_name.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/CMakeLists.txt 2016-03-02 19:06:25.059777274 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/CMakeLists.txt 2016-03-02 19:08:33.867339418 +0100
-@@ -46,7 +46,7 @@
-
- # Header file for CMake settings
- #hacky use layer include directory from loader repo
--set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/include)
-+set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/include)
- include_directories(${PROJECT_SOURCE_DIR}/include ${LOADER_UNCLUDE_DIR})
-
- if(NOT WIN32)
-@@ -109,7 +109,7 @@
- set(PYTHON_CMD "py")
- endif()
-
--set(LOADER_PY_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers)
-+set(LOADER_PY_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers)
-
- # icd: Device dependent (DD) VULKAN components
- # tests: VULKAN tests
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/buildAndroid/android-generate.sh vulkan-sdk-1.0.3.0/VulkanTools/buildAndroid/android-generate.sh
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/buildAndroid/android-generate.sh 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/buildAndroid/android-generate.sh 2016-03-02 19:07:43.720328878 +0100
-@@ -19,8 +19,8 @@
- mkdir -p generated
- python ../vk-generate.py dispatch-table-ops layer > generated/vk_dispatch_table_helper.h
-
--python ../vk_helper.py --gen_enum_string_helper ../../LoaderAndValidationLayers/include/vulkan/vulkan.h --abs_out_dir generated
--python ../vk_helper.py --gen_struct_wrappers ../../LoaderAndValidationLayers/include/vulkan/vulkan.h --abs_out_dir generated
-+python ../vk_helper.py --gen_enum_string_helper ../../Vulkan-LoaderAndValidationLayers/include/vulkan/vulkan.h --abs_out_dir generated
-+python ../vk_helper.py --gen_struct_wrappers ../../Vulkan-LoaderAndValidationLayers/include/vulkan/vulkan.h --abs_out_dir generated
-
- python ../vk-layer-generate.py generic ../include/vulkan/vulkan.h > generated/generic_layer.cpp
- python ../vk-layer-generate.py api_dump ../include/vulkan/vulkan.h > generated/api_dump.cpp
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/icd/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/icd/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/icd/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/icd/CMakeLists.txt 2016-03-02 19:08:42.490731325 +0100
-@@ -13,7 +13,7 @@
- endif()
-
- #hacky get include files from loader repo
--set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/include)
-+set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/include)
- include_directories( ${LOADER_INCLUDE_DIR} )
-
- add_subdirectory(common)
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt 2016-03-02 19:06:25.066443989 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt 2016-03-02 19:08:16.697222308 +0100
-@@ -1,6 +1,6 @@
- cmake_minimum_required (VERSION 2.8.11)
-
--set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/include)
-+set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/include)
- macro(run_vk_helper subcmd)
- add_custom_command(OUTPUT ${ARGN}
- COMMAND ${PYTHON_CMD} ${LOADER_PY_DIR}/vk_helper.py --${subcmd} ${LOADER_INCLUDE_DIR}/vulkan/vulkan.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR}
-@@ -72,8 +72,8 @@
- endif()
-
- #hacky use layer include directory from loader repo
--set (LOADER_LAYER_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/layers)
--set (LOADER_LOADER_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/loader)
-+set (LOADER_LAYER_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/layers)
-+set (LOADER_LOADER_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/loader)
- include_directories(
- ${LOADER_LAYER_DIR}
- ${LOADER_LOADER_DIR}
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/tests/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/tests/CMakeLists.txt 2016-03-02 19:06:25.059777274 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/tests/CMakeLists.txt 2016-03-02 19:08:28.020632945 +0100
-@@ -88,7 +88,7 @@
- endif()
-
- #hacky get include files from loader repo
--set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/include)
-+set (LOADER_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/include)
- include_directories(
- ${LOADER_INCLUDE_DIR}
- "${PROJECT_SOURCE_DIR}/tests/gtest-1.7.0/include"
-@@ -131,13 +131,13 @@
- set (LIBVK "vulkan-${MAJOR}")
- if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(LIBVK
-- ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/${BUILDTGT_DIR}/loader/${CMAKE_CFG_INTDIR}/vulkan-${MAJOR}.lib
-+ ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/${BUILDTGT_DIR}/loader/${CMAKE_CFG_INTDIR}/vulkan-${MAJOR}.lib
- )
- endif()
-
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(LIBVK
-- ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/build/loader/${CMAKE_CFG_INTDIR}/libvulkan.so
-+ ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/build/loader/${CMAKE_CFG_INTDIR}/libvulkan.so
- )
- endif()
- add_executable(vkbase init.cpp ${COMMON_CPP})
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/vk-generate.py vulkan-sdk-1.0.3.0/VulkanTools/vk-generate.py
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/vk-generate.py 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/vk-generate.py 2016-03-02 19:08:50.470785391 +0100
-@@ -27,7 +27,7 @@
-
- import sys
- import imp
--vulkan = imp.load_source('vulkan', '../../../../LoaderAndValidationLayers/vulkan.py')
-+vulkan = imp.load_source('vulkan', '../../../../Vulkan-LoaderAndValidationLayers/vulkan.py')
-
-
- def generate_get_proc_addr_check(name):
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/vk-layer-generate.py vulkan-sdk-1.0.3.0/VulkanTools/vk-layer-generate.py
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/vk-layer-generate.py 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/vk-layer-generate.py 2016-03-02 19:09:51.384527220 +0100
-@@ -37,8 +37,8 @@
- import re
-
- import imp
--vulkan = imp.load_source('vulkan', '../../../LoaderAndValidationLayers/vulkan.py')
--vk_helper = imp.load_source('vulkan', '../../../LoaderAndValidationLayers/vk_helper.py')
-+vulkan = imp.load_source('vulkan', '../../../Vulkan-LoaderAndValidationLayers/vulkan.py')
-+vk_helper = imp.load_source('vulkan', '../../../Vulkan-LoaderAndValidationLayers/vk_helper.py')
- from source_line_info import sourcelineinfo
- from collections import defaultdict
-
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/vktrace/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/vktrace/CMakeLists.txt 2016-03-02 19:09:41.847797072 +0100
-@@ -26,7 +26,7 @@
- endif()
-
- #hacky get include files from loader repo
--set (VKTRACE_VULKAN_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/include)
-+set (VKTRACE_VULKAN_INCLUDE_DIR ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/include)
- include_directories( ${VKTRACE_VULKAN_INCLUDE_DIR} )
-
- message("")
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/vktrace/src/vktrace_extensions/vktracevulkan/CMakeLists.txt 2016-03-02 19:09:32.241066284 +0100
-@@ -30,14 +30,14 @@
-
- if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(VKTRACE_VULKAN_LIB
-- ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/${BUILDTGT_DIR}/loader/${CMAKE_CFG_INTDIR}/vulkan-${MAJOR}.lib
-+ ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/${BUILDTGT_DIR}/loader/${CMAKE_CFG_INTDIR}/vulkan-${MAJOR}.lib
- )
- endif()
-
-
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(VKTRACE_VULKAN_LIB
-- ${VULKANTOOLS_SOURCE_DIR}/../LoaderAndValidationLayers/build/loader/libvulkan.so
-+ ${VULKANTOOLS_SOURCE_DIR}/../Vulkan-LoaderAndValidationLayers/build/loader/libvulkan.so
- )
- endif()
-
-diff -dur -x '*~' vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/vktrace_generate.py vulkan-sdk-1.0.3.0/VulkanTools/vktrace/vktrace_generate.py
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/vktrace/vktrace_generate.py 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/vktrace/vktrace_generate.py 2016-03-02 19:09:20.920990500 +0100
-@@ -37,7 +37,7 @@
- sys.path.append(main_path)
- from source_line_info import sourcelineinfo
- import imp
--vulkan = imp.load_source('vulkan', '%s/../LoaderAndValidationLayers/vulkan.py' % main_path)
-+vulkan = imp.load_source('vulkan', '%s/../Vulkan-LoaderAndValidationLayers/vulkan.py' % main_path)
-
- # vulkan.py doesn't include all the extensions (debug_report missing)
- headers = []
diff --git a/rpath.patch b/rpath.patch
index 6147f9c..9cbb6e0 100644
--- a/rpath.patch
+++ b/rpath.patch
@@ -1,6 +1,6 @@
-diff -dur -x '*~' -x '*.orig' vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt 2016-02-24 10:16:45.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt 2016-02-24 10:17:24.000000000 +0100
+diff -dur -x '*~' -x '*.orig' vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt
+--- vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt 2016-02-24 10:16:45.000000000 +0100
++++ vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt 2016-02-24 10:17:24.000000000 +0100
@@ -26,7 +26,7 @@
VkLayer_device_limits
)
@@ -10,15 +10,3 @@ diff -dur -x '*~' -x '*.orig' vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidation
set(CMAKE_INSTALL_RPATH ${VK_LAYER_RPATH})
if (NOT WIN32)
-diff -dur -x '*~' -x '*.orig' vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/layers/CMakeLists.txt 2016-02-24 10:17:37.000000000 +0100
-@@ -23,7 +23,7 @@
- VkLayer_screenshot
- )
-
--set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer)
-+set(VK_LAYER_RPATH "${CMAKE_INSTALL_LIBDIR}/vulkan/layer")
- set(CMAKE_INSTALL_RPATH ${VK_LAYER_RPATH})
-
- if (NOT WIN32)
diff --git a/system_glslang.patch b/system_glslang.patch
index 0474cc9..45ee713 100644
--- a/system_glslang.patch
+++ b/system_glslang.patch
@@ -1,19 +1,18 @@
-Only in vulkan-sdk-1.0.3.0: LoaderAndValidationLayers
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/CMakeLists.txt vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/CMakeLists.txt 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
-@@ -72,7 +72,7 @@
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
+@@ -90,7 +90,7 @@
- if (BUILD_TESTS)
+ if (BUILD_ICD OR BUILD_TESTS)
# Hard code our glslang path for now
- get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE)
+ set(GLSLANG_PREFIX /usr/include/glslang)
if(NOT EXISTS ${GLSLANG_PREFIX})
message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX})
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/CMakeLists.txt vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/CMakeLists.txt 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/demos/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
@@ -28,45 +28,45 @@
endif()
@@ -76,54 +75,39 @@ diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/demos/CMakeLi
)
endif()
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
-@@ -79,7 +79,7 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/../loader
- ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
- ${CMAKE_CURRENT_BINARY_DIR}
-- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
-+ /usr/include/glslang/SPIRV
- )
-
- if (WIN32)
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/tests/CMakeLists.txt vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/tests/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/tests/CMakeLists.txt 2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/tests/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
-@@ -67,13 +67,13 @@
- IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
- else ()
- set_target_properties(glslang PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libglslang.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libglslang.a")
- set_target_properties(OGLCompiler PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOGLCompiler.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a")
- set_target_properties(OSDependent PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOSDependent.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOSDependent.a")
- set_target_properties(SPIRV PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libSPIRV.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
- endif()
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
+@@ -1,4 +1,4 @@
+-set(GLSLANG_VALIDATOR ${GLSLANG_PREFIX}/build/install/bin/glslangValidator)
++set(GLSLANG_VALIDATOR glslangValidator)
+ set (GLMINC_PREFIX ${PROJECT_SOURCE_DIR}/libs)
- include_directories(
-diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
-@@ -77,7 +77,7 @@
+ macro(generate_dispatch_table out)
+@@ -11,7 +11,7 @@
+ macro(glsl_to_spirv src)
+ add_custom_command(OUTPUT ${src}.h
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
+ )
+ endmacro()
- if (BUILD_ICD OR BUILD_TESTS)
- # Hard code our glslang path for now
-- get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE)
-+ set(GLSLANG_PREFIX /usr/include/glslang)
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 20:42:39.011470974 +0100
+@@ -38,7 +38,7 @@
+ in_filename = sys.argv[1]
+ out_filename = sys.argv[2] if len(sys.argv) > 2 else None
+ validator = sys.argv[3] if len(sys.argv) > 3 else \
+- "../../../glslang/build/install/bin/glslangValidator"
++ "glslangValidator"
- if(NOT EXISTS ${GLSLANG_PREFIX})
- message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX})
-diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/icd/intel/compiler/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
+ def identifierize(s):
+ # translate invalid chars
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 20:42:44.144824665 +0100
@@ -38,15 +38,6 @@
message(FATAL_ERROR "llvm-config failed: " ${LLVM_LIBS_RESULT})
endif()
@@ -161,9 +145,21 @@ diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt
SET(COMPILER_INCLUDE_DIRS
${GLSLANG_PREFIX}
-diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.0.3.0/VulkanTools/tests/CMakeLists.txt
---- vulkan-sdk-1.0.3.0.orig/VulkanTools/tests/CMakeLists.txt 2016-02-23 00:08:24.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/VulkanTools/tests/CMakeLists.txt 2016-02-24 10:16:23.000000000 +0100
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
+@@ -99,7 +99,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/../loader
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
+ ${CMAKE_CURRENT_BINARY_DIR}
+- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
++ /usr/include/glslang/SPIRV
+ )
+
+ if (WIN32)
+diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt
+--- vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
++++ vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt 2016-03-12 20:42:39.014804320 +0100
@@ -78,13 +78,13 @@
IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
else ()
@@ -181,4 +177,4 @@ diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.
+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
endif()
- #hacky get include files from loader repo
+ include_directories(
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/37fbe15cad369269923561d751cc62b031435102
More information about the pld-cvs-commit
mailing list