-diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.8.0/VulkanTools/layers/CMakeLists.txt
---- vulkan-sdk-1.0.8.0.orig/VulkanTools/layers/CMakeLists.txt 2016-04-07 18:04:06.000000000 +0200
-+++ vulkan-sdk-1.0.8.0/VulkanTools/layers/CMakeLists.txt 2016-04-08 18:39:03.349435699 +0200
-@@ -31,7 +31,7 @@
- VkLayer_device_limits
- )
-
--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)
-Only in vulkan-sdk-1.0.8.0/VulkanTools/layers: CMakeLists.txt.orig
diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/layersvt/CMakeLists.txt vulkan-sdk-1.0.8.0/VulkanTools/layersvt/CMakeLists.txt
--- vulkan-sdk-1.0.8.0.orig/VulkanTools/layersvt/CMakeLists.txt 2016-04-07 18:04:06.000000000 +0200
+++ vulkan-sdk-1.0.8.0/VulkanTools/layersvt/CMakeLists.txt 2016-04-08 18:41:00.779467329 +0200
-diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.8.0/VulkanTools/CMakeLists.txt
---- vulkan-sdk-1.0.8.0.orig/VulkanTools/CMakeLists.txt 2016-04-07 18:04:06.000000000 +0200
-+++ vulkan-sdk-1.0.8.0/VulkanTools/CMakeLists.txt 2016-04-08 17:29:12.705768040 +0200
-@@ -103,13 +103,14 @@
- option(BUILD_VKTRACE "Build VkTrace" ON)
- option(BUILD_VKJSON "Build vkjson" ON)
-
--if (BUILD_ICD OR BUILD_TESTS)
- find_program(GLSLANG_VALIDATOR NAMES glslangValidator
-- HINTS "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/install/bin"
-+ HINTS "/usr/bin"
-+ "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/install/bin"
- "${PROJECT_SOURCE_DIR}/../${BINDATA_DIR}" )
-
-- find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${CMAKE_SOURCE_DIR}/../glslang" DOC "Path to SPIRV/spirv.hpp")
-- find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
-+ find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include/glslang" "${CMAKE_SOURCE_DIR}/../glslang" DOC "Path to SPIRV/spirv.hpp")
-+ find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include"
-+ "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
- "${CMAKE_SOURCE_DIR}/../source/spirv-tools/include"
- "${CMAKE_SOURCE_DIR}/../spirv-tools/external/include"
- "${CMAKE_SOURCE_DIR}/../source/spirv-tools/external/include"
-@@ -122,8 +123,8 @@
- "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/SPIRV/Release" )
- set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/source/Release")
+diff -dur -x '*.orig' -x '*.rej' -x '*~' vulkan-sdk-1.0.17.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.17.0/VulkanTools/CMakeLists.txt
+--- vulkan-sdk-1.0.17.0.orig/VulkanTools/CMakeLists.txt 2016-06-23 17:32:27.000000000 +0200
++++ vulkan-sdk-1.0.17.0/VulkanTools/CMakeLists.txt 2016-07-14 10:51:13.000000000 +0200
+@@ -162,7 +162,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"
+@@ -170,26 +170,27 @@
+ "${GLSLANG_BINARY_ROOT}/hlsl"
+ "${GLSLANG_BINARY_ROOT}/StandAlone")
else()
-- set (GLSLANG_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../glslang/build/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
-- set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/build/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
-+ set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_SOURCE_DIR}/../glslang/build/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
-+ set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_SOURCE_DIR}/../spirv-tools/build/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
+- 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" )
endif()
- find_library(GLSLANG_LIB NAMES glslang
-@@ -189,7 +190,6 @@
- set (GLSLANG_LIBRARIES ${GLSLANG_LIB} ${OGLCompiler_LIB} ${OSDependent_LIB} ${SPIRV_LIB})
- set (SPIRV_TOOLS_LIBRARIES ${SPIRV_TOOLS_LIB})
+ if(CUSTOM_SPIRV_TOOLS_BIN_ROOT)
+ set (SPIRV_TOOLS_SEARCH_PATH "${SPIRV_TOOLS_BINARY_ROOT}/source" )
+ 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" )
endif()
--endif()
+ endif()
+
+ find_program(GLSLANG_VALIDATOR NAMES glslangValidator
+- HINTS "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
++ HINTS "/usr/bin"
++ "${CMAKE_SOURCE_DIR}/external/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"
+ "${CMAKE_SOURCE_DIR}/../glslang"
+ DOC "Path to SPIRV/spirv.hpp")
- if (BUILD_ICD)
- # Hard code our LunarGLASS path for now
-diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/CMakeLists.txt
---- vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/CMakeLists.txt 2016-04-07 18:04:06.000000000 +0200
-+++ vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/CMakeLists.txt 2016-04-08 17:29:00.568752815 +0200
+-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' -x '*.rej' -x '*~' vulkan-sdk-1.0.17.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-sdk-1.0.17.0/VulkanTools/demos/smoke/CMakeLists.txt
+--- vulkan-sdk-1.0.17.0.orig/VulkanTools/demos/smoke/CMakeLists.txt 2016-06-23 17:32:27.000000000 +0200
++++ vulkan-sdk-1.0.17.0/VulkanTools/demos/smoke/CMakeLists.txt 2016-07-14 10:47:42.000000000 +0200
@@ -10,7 +10,7 @@
macro(glsl_to_spirv src)
add_custom_command(OUTPUT ${src}.h
)
endmacro()
-diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/glsl-to-spirv vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/glsl-to-spirv
---- vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/glsl-to-spirv 2016-04-07 18:04:06.000000000 +0200
-+++ vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/glsl-to-spirv 2016-04-08 17:29:00.568752815 +0200
-@@ -38,7 +38,7 @@
+--- vulkan-sdk-1.0.17.0.orig/VulkanTools/demos/smoke/glsl-to-spirv 2016-06-23 17:32:27.000000000 +0200
++++ vulkan-sdk-1.0.17.0/VulkanTools/demos/smoke/glsl-to-spirv 2016-07-14 10:47:42.000000000 +0200
+@@ -32,7 +32,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 \
/* TODO: Probably want to make this manual to get the result of the boolean and then check it on replay
VKTRACER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL __HOOKED_vkGetPhysicalDeviceSurfaceSupportKHR(
+--- vulkan-sdk-1.0.17.0.orig/VulkanTools/vk_helper.py 2016-06-23 17:32:27.000000000 +0200
++++ vulkan-sdk-1.0.17.0/VulkanTools/vk_helper.py 2016-07-14 13:14:33.000000000 +0200
+@@ -1423,7 +1423,7 @@
+ elif is_type(self.struct_dict[s][m]['type'], 'struct'):
+ sh_funcs.append('%sstructSize += %s(pStruct->%s);' % (indent, self._get_size_helper_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['name']))
+ elif 'void' not in self.struct_dict[s][m]['type'].lower():
+- if (self.struct_dict[s][m]['type'] != 'xcb_connection_t'):
++ if (self.struct_dict[s][m]['type'] not in ('xcb_connection_t', 'struct wl_display', 'struct wl_surface')):
+ sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type']))
+ elif 'size_t' == self.struct_dict[s][m]['type'].lower():
+ sh_funcs.append('%sstructSize += pStruct->%s;' % (indent, self.struct_dict[s][m]['name']))
+--- vulkan-sdk-1.0.17.0.orig/VulkanTools/vk_helper_api_dump.py 2016-06-23 17:32:27.000000000 +0200
++++ vulkan-sdk-1.0.17.0/VulkanTools/vk_helper_api_dump.py 2016-07-14 13:14:44.000000000 +0200
+@@ -1468,7 +1468,7 @@
+ elif is_type(self.struct_dict[s][m]['type'], 'struct'):
+ sh_funcs.append('%sstructSize += %s(pStruct->%s);' % (indent, self._get_size_helper_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['name']))
+ elif 'void' not in self.struct_dict[s][m]['type'].lower():
+- if (self.struct_dict[s][m]['type'] != 'xcb_connection_t'):
++ if (self.struct_dict[s][m]['type'] not in ('xcb_connection_t', 'struct wl_display', 'struct wl_surface')):
+ sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type']))
+ elif 'size_t' == self.struct_dict[s][m]['type'].lower():
+ sh_funcs.append('%sstructSize += pStruct->%s;' % (indent, self.struct_dict[s][m]['name']))
%undefine with_icd
%endif
-%define api_version 1.0.8
+%define api_version 1.0.17
%define llvm_version 3.4.2
%define snap 2016012
-# sdk-1.0.8 branch
-%define tools_commit 0ee123463a4ea5878aea9f6884830baecfd56d24
# master branch
%define lg_commit 0a73713f0d664aa97a7e359f567a16d7c3fce359
%define rel 3
Summary: LunarG Vulkan SDK
Name: vulkan-sdk
-Version: 1.0.8.0
-Release: 0.s%{snap}.%{rel}
+Version: 1.0.17.0
+Release: 0.1
License: MIT-like
Group: Development
-Source0: https://github.com/LunarG/VulkanTools/archive/%{tools_commit}/VulkanTools-s%{snap}.tar.gz
-# Source0-md5: ff6af5dbcc3bb2354a8e336dd03c18bb
+Source0: https://github.com/LunarG/VulkanTools/archive/sdk-%{version}/VulkanTools-%{version}.tar.gz
+# Source0-md5: 5f52f9f8309d40758f1238e517e7ef74
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
%{?with_icd:BuildRequires: clang}
BuildRequires: cmake
BuildRequires: GLM
-BuildRequires: glslang >= 3.0.s20160325
-BuildRequires: glslang-devel >= 3.0.s20160325
+BuildRequires: glslang >= 3.0.s20160513
+BuildRequires: glslang-devel >= 3.0.s20160513
BuildRequires: graphviz
BuildRequires: ImageMagick-devel
BuildRequires: libpng
BuildRequires: python3
BuildRequires: python3-lxml
BuildRequires: python3-modules
-BuildRequires: spirv-tools-devel >= 1.0_rev3.s20160329
+BuildRequires: spirv-tools-devel >= 1.0_rev3.s20160614
BuildRequires: udev-devel
%{?with_icd:BuildRequires: xorg-lib-libpciaccess-devel}
-Requires: glslang >= 3.0.s20160325
-Requires: spirv-tools >= 1.0_rev3.s20160329
+Requires: glslang >= 3.0.s20160513
+Requires: spirv-tools >= 1.0_rev3.s20160614
Requires: %{name}-debug-layers = %{version}-%{release}
Requires: vulkan-devel = %{version}-%{release}
Requires: vulkan-loader = %{version}-%{release}
Summary: Experimental Vulkan driver for Intel GPUs
Group: X11/Libraries
Suggests: vulkan(loader)
-Provides: vulkan(icd) = 1.0.8
+Provides: vulkan(icd) = 1.0.17
%description icd-intel
Experimental Vulkan driver for Intel GPUs.
Summary: Dummy Vulkan driver
Group: X11/Libraries
Suggests: vulkan(loader)
-Provides: vulkan(icd) = 1.0.8
+Provides: vulkan(icd) = 1.0.17
%description icd-nulldrv
Dummy Vulkan driver.
%prep
%setup -q -c %{?with_icd:-a1}
-mv VulkanTools-%{tools_commit} VulkanTools
+mv VulkanTools-sdk-%{version} VulkanTools
%patch0 -p1
%patch1 -p1
cd VulkanTools/build
%{__make} install
-cp -p loader/libvulkan.so.1.0.8 $RPM_BUILD_ROOT%{_libdir}
-ln -s libvulkan.so.1.0.8 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so
-ln -s libvulkan.so.1.0.8 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so.1
+cp -p loader/libvulkan.so.1.0.17 $RPM_BUILD_ROOT%{_libdir}
+ln -s libvulkan.so.1.0.17 $RPM_BUILD_ROOT%{_libdir}/libvulkan.so
+ln -s libvulkan.so.1.0.17 $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
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_swapchain.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_threading.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_unique_objects.so
-%attr(755,root,root) %{_libdir}/vulkan/layer/liblayer_utils.so
+%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_utils.so
%{_datadir}/vulkan/explicit_layer.d/VkLayer_core_validation.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_device_limits.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_image.json
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_generic.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_multi.so
%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_screenshot.so
-%attr(755,root,root) %{_libdir}/vulkan/layer/liblayer_utilsvt.so
+%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_utilsvt.so
%{_datadir}/vulkan/explicit_layer.d/VkLayer_api_dump.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_basic.json
%{_datadir}/vulkan/explicit_layer.d/VkLayer_generic.json
projects / packages / vulkan-sdk.git / commitdiff