[packages/vulkan-sdk] 1.0.8 finished

jajcus jajcus at pld-linux.org
Fri Apr 8 19:06:32 CEST 2016


commit 78da5abe0eb723d1aea72056ceb55d263cac3196
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Fri Apr 8 19:04:05 2016 +0200

    1.0.8 finished
    
    Release: 1

 always_xcb.patch                     |  11 +++
 rpath.patch                          |  21 +++-
 system_glslang.patch                 | 180 -----------------------------------
 system_glslang_and_spirv-tools.patch |  65 +++++++++++++
 vktrace_wayland.patch                |  41 ++++++++
 vulkan-sdk.spec                      |  62 ++++++------
 wayland.patch                        | 148 ----------------------------
 7 files changed, 166 insertions(+), 362 deletions(-)
---
diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index e355b90..40876fa 100644
--- a/vulkan-sdk.spec
+++ b/vulkan-sdk.spec
@@ -1,13 +1,10 @@
 #
-# 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_with	wayland		# enable Wayland support in loader
+%bcond_without	wayland		# enable Wayland support in loader
+%bcond_without	xlib		# enable XLib support in loader
 
 %ifnarch %{x8664}
 %undefine       with_icd
@@ -21,7 +18,7 @@
 %define tools_commit	0ee123463a4ea5878aea9f6884830baecfd56d24
 # master branch
 %define	lg_commit	0a73713f0d664aa97a7e359f567a16d7c3fce359
-%define	rel	0.1
+%define	rel	1
 Summary:	LunarG Vulkan SDK
 Name:		vulkan-sdk
 Version:	1.0.8.0
@@ -34,11 +31,13 @@ Source1:	https://github.com/LunarG/LunarGLASS/archive/%{lg_commit}/LunarGLASS-%{
 # 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:		wayland.patch
+Patch0:		system_glslang_and_spirv-tools.patch
+Patch1:		demos_out_of_src.patch
+Patch2:		rpath.patch
+Patch3:		always_xcb.patch
+Patch4:		vktrace_wayland.patch
+# LunarGLASS patches
+Patch100:	LunarGLASS-CMakeLists.patch
 URL:		http://lunarg.com/vulkan-sdk/
 %{?with_icd:BuildRequires:	Mesa-libGL-devel}
 BuildRequires:	bison
@@ -127,7 +126,7 @@ Vulkan tools.
 Summary:	Experimental Vulkan driver for Intel GPUs
 Group:		X11/Libraries
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.5
+Provides:	vulkan(icd) = 1.0.8
 
 %description icd-intel
 Experimental Vulkan driver for Intel GPUs.
@@ -136,7 +135,7 @@ Experimental Vulkan driver for Intel GPUs.
 Summary:	Dummy Vulkan driver
 Group:		X11/Libraries
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.5
+Provides:	vulkan(icd) = 1.0.8
 
 %description icd-nulldrv
 Dummy Vulkan driver.
@@ -147,9 +146,10 @@ Dummy Vulkan driver.
 mv VulkanTools-%{tools_commit} VulkanTools
 
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 
 %if %{with icd}
 mv LunarGLASS-%{lg_commit} LunarGLASS
@@ -158,7 +158,7 @@ tar -x --strip-components=1 --skip-old-files -f %{SOURCE3}
 cp -R ../../../../VulkanTools/LunarGLASS/* .
 cd ../../../..
 
-%patch1 -p1
+%patch100 -p1
 %endif
 
 %build
@@ -199,6 +199,7 @@ cd VulkanTools/build
 	-DCMAKE_INSTALL_SYSCONFDIR=etc \
 	-DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
 	-DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
+	-DBUILD_WSI_XLIB_SUPPORT=%{?with_xlib:ON}%{!?with_xlib:OFF} \
 	-DBUILD_ICD=%{?with_icd:ON}%{!?with_icd:OFF} \
 		../
 %{__make}
@@ -224,18 +225,18 @@ $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/vulkan/{explicit,implicit}_layer.d \
 cd VulkanTools/build
 %{__make} install
 
-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 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 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/smoketest $RPM_BUILD_ROOT%{_bindir}/vulkan-smoketest
 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
-for f in layers/*.json ; do
+for f in layers/*.json layersvt/*.json ; do
 sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/$(basename $f)
 done
 
@@ -248,19 +249,21 @@ cp -p ../include/vulkan/* $RPM_BUILD_ROOT%{_includedir}/vulkan
 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}
+%patch1 -R -p3 -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 rm -f $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*.orig 2>/dev/null || :
 
 %ifarch %x8664
 cp -p vktrace/libVkLayer_vktrace_layer.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer
 cp -p vktrace/vkreplay $RPM_BUILD_ROOT%{_bindir}
 cp -p vktrace/vktrace $RPM_BUILD_ROOT%{_bindir}
+sed -e's@"library_path": "../vktrace/@"library_path": "%{_libdir}/vulkan/layer/@' \
+	layersvt/VkLayer_vktrace_layer.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
 %else
 cp -p vktrace/libVkLayer_vktrace_layer32.so $RPM_BUILD_ROOT%{_libdir}/vulkan/layer
 cp -p vktrace/vkreplay32 $RPM_BUILD_ROOT%{_bindir}
 cp -p vktrace/vktrace32 $RPM_BUILD_ROOT%{_bindir}
 rm $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer.json
-sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' \
+sed -e's@"library_path": "../vktrace/@"library_path": "%{_libdir}/vulkan/layer/@' \
     -e's at libVkLayer_vktrace_layer.so@libVkLayer_vktrace_layer32.so@' \
 	layers/VkLayer_vktrace_layer.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/explicit_layer.d/VkLayer_vktrace_layer32.json
 %endif
@@ -306,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc VulkanTools/LICENSE.txt
 %attr(755,root,root) %{_bindir}/vulkan-cube
-%attr(755,root,root) %{_bindir}/vulkan-smoke
+%attr(755,root,root) %{_bindir}/vulkan-smoketest
 %attr(755,root,root) %{_bindir}/vulkan-tri
 %{_datadir}/%{name}-demos
 
@@ -333,22 +336,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc VulkanTools/LICENSE.txt
 %doc VulkanTools/layers/{README.md,vk_layer_settings.txt}
+%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_core_validation.so
 %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
-%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_mem_tracker.so
 %attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_object_tracker.so
-%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_param_checker.so
+%attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_parameter_validation.so
 %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
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_core_validation.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_device_limits.json
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_draw_state.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_image.json
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_mem_tracker.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_object_tracker.json
-%{_datadir}/vulkan/explicit_layer.d/VkLayer_param_checker.json
+%{_datadir}/vulkan/explicit_layer.d/VkLayer_parameter_validation.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_swapchain.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_threading.json
 %{_datadir}/vulkan/explicit_layer.d/VkLayer_unique_objects.json
@@ -356,12 +357,13 @@ rm -rf $RPM_BUILD_ROOT
 %files debug-layers
 %defattr(644,root,root,755)
 %doc VulkanTools/LICENSE.txt
-%doc VulkanTools/layers/{README.md,vk_layer_settings.txt}
+%doc VulkanTools/layersvt/{README.md,vk_layer_settings.txt}
 %attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_api_dump.so
 %attr(755,root,root) %{_libdir}/vulkan/layer/libVkLayer_basic.so
 %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
 %{_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
diff --git a/always_xcb.patch b/always_xcb.patch
new file mode 100644
index 0000000..6ea3dd8
--- /dev/null
+++ b/always_xcb.patch
@@ -0,0 +1,11 @@
+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-08 17:38:54.448725526 +0200
++++ vulkan-sdk-1.0.8.0/VulkanTools/CMakeLists.txt	2016-04-08 17:39:26.630546234 +0200
+@@ -44,6 +44,7 @@
+         add_definitions(-DVK_USE_PLATFORM_MIR_KHR)
+         set(DisplayServer Mir)
+     endif()
++    set(DisplayServer Xcb)
+ else()
+     message(FATAL_ERROR "Unsupported Platform!")
+ endif()
diff --git a/rpath.patch b/rpath.patch
index 9cbb6e0..7d993f7 100644
--- a/rpath.patch
+++ b/rpath.patch
@@ -1,7 +1,7 @@
-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 @@
+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
      )
  
@@ -10,3 +10,16 @@ diff -dur -x '*~' -x '*.orig' vulkan-sdk-1.0.3.0.orig/VulkanTools/layers/CMakeLi
  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
+@@ -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
deleted file mode 100644
index 45ee713..0000000
--- a/system_glslang.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-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_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 -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()
- 
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
--       COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
-+       COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
-        COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
--       DEPENDS tri.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+       DEPENDS tri.vert
-        )
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
--       COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
-+       COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
-        COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
--       DEPENDS tri.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+       DEPENDS tri.frag
-        )
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
--       COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
-+       COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
-        COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
--       DEPENDS cube.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+       DEPENDS cube.vert
-        )
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
--       COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
-+       COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
-        COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
--       DEPENDS cube.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+       DEPENDS cube.frag
-        )
-    file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
-    file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
-    file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- else()
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
--       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert 
--       DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-+       COMMAND glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert 
-+       DEPENDS tri.vert
-        )
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
--       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
--       DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-+       COMMAND glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
-+       DEPENDS tri.frag
-        )
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
--       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
--       DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-+       COMMAND glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
-+       DEPENDS cube.vert
-        )
- 
-     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
--       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
--       DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
-+       COMMAND glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
-+       DEPENDS cube.frag
-        )
- 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)
- 
- 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()
- 
-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"
- 
- 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()
- 
--# Expect libraries to be in either the build (release build) or dbuild (debug) directories
--if(EXISTS ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/lib)
--    set(GLSLANG_BUILD ${GLSLANG_PREFIX}/${BUILDTGT_DIR})
--elseif(EXISTS ${GLSLANG_PREFIX}/dbuild/install/lib)
--    set(GLSLANG_BUILD ${GLSLANG_PREFIX}/dbuild)
--else()
--    message(FATAL_ERROR "Necessary glslang libraries cannot be found: " ${GLSLANG_PREFIX})
--endif()
--
- if(EXISTS ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/install/lib)
-     set(LUNARGLASS_BUILD ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR})
- elseif(EXISTS ${LUNARGLASS_PREFIX}/dbuild/install/lib)
-@@ -75,7 +66,6 @@
-       COMPILE_FLAGS "${LLVM_CXX_CONFIG}")
- 
- SET(COMPILER_LINK_DIRS
--    -L${GLSLANG_BUILD}/install/lib
-     -L${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib
-     -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core
-     -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/glslang
-@@ -121,9 +111,9 @@
- set_target_properties(SpvFrontend     PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/SPIRV/libSpvFrontend.a)
- set_target_properties(core            PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core/libcore.a)
- set_target_properties(LLVMipo         PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib/libLLVMipo.a)
--set_target_properties(glslang         PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libglslang.a)
--set_target_properties(SPIRV           PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libSPIRV.a)
--set_target_properties(OGLCompiler     PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libOGLCompiler.a)
-+set_target_properties(glslang         PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libglslang.a)
-+set_target_properties(SPIRV           PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libSPIRV.a)
-+set_target_properties(OGLCompiler     PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a)
- 
- SET(COMPILER_INCLUDE_DIRS
-     ${GLSLANG_PREFIX}
-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 ()
-    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()
- 
- include_directories(
diff --git a/system_glslang_and_spirv-tools.patch b/system_glslang_and_spirv-tools.patch
new file mode 100644
index 0000000..0aae65b
--- /dev/null
+++ b/system_glslang_and_spirv-tools.patch
@@ -0,0 +1,65 @@
+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")
+     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" )
+     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})
+     endif()
+-endif()
+ 
+ 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
+@@ -10,7 +10,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()
+ 
+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 @@
+ 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"
+ 
+ def identifierize(s):
+     # translate invalid chars
diff --git a/vktrace_wayland.patch b/vktrace_wayland.patch
new file mode 100644
index 0000000..2f98402
--- /dev/null
+++ b/vktrace_wayland.patch
@@ -0,0 +1,41 @@
+diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp vulkan-sdk-1.0.8.0/VulkanTools/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp
+--- vulkan-sdk-1.0.8.0.orig/VulkanTools/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp	2016-04-07 18:04:06.000000000 +0200
++++ vulkan-sdk-1.0.8.0/VulkanTools/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp	2016-04-08 18:01:49.000000000 +0200
+@@ -1507,7 +1507,36 @@
+     return result;
+ }
+ #endif
+-//TODO Wayland and Mir support
++#ifdef VK_USE_PLATFORM_WAYLAND_KHR
++VKTRACER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL __HOOKED_vkCreateWaylandSurfaceKHR(
++    VkInstance                                  instance,
++    const VkWaylandSurfaceCreateInfoKHR*        pCreateInfo,
++    const VkAllocationCallbacks*                pAllocator,
++    VkSurfaceKHR*                               pSurface)
++{
++    VkResult result;
++
++    // TODO: Implement.
++
++    result = mid(instance)->instTable.CreateWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
++
++    return result;
++}
++
++VKTRACER_EXPORT VKAPI_ATTR VkBool32 VKAPI_CALL __HOOKED_vkGetPhysicalDeviceWaylandPresentationSupportKHR(
++    VkPhysicalDevice                            physicalDevice,
++    uint32_t                                    queueFamilyIndex,
++    struct wl_display*                          display)
++{
++    VkBool32 result;
++
++    // TODO: Implement.
++
++    result = mid(physicalDevice)->instTable.GetPhysicalDeviceWaylandPresentationSupportKHR(physicalDevice, queueFamilyIndex, display);
++
++    return result;
++}
++#endif
+ 
+ /* 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(
diff --git a/wayland.patch b/wayland.patch
deleted file mode 100644
index 5387161..0000000
--- a/wayland.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-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-03-02 19:22:28.256866043 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/CMakeLists.txt	2016-03-02 21:25:25.331130657 +0100
-@@ -19,21 +19,30 @@
-     add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
-     set(DisplayServer Android)
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
--    add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
--    set(DisplayServer Xcb)
-+    #   TODO: Basic support is present for Xlib but is untested.
-+    #         Mir support is stubbed in but unimplemented and untested.
-+    option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
-+    option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" OFF)
-+    option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" OFF)
-+    option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" OFF)
- 
--#   TODO: Basic support is present for Xlib but is untested.
--#         Wayland/Mir support is stubbed in but unimplemented and untested.
-+    set(DisplayServer Xcb)
- 
--#   add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
--#   set(DisplayServer Xlib)
-+    if (BUILD_WSI_XCB_SUPPORT)
-+        add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
-+    endif()
- 
--#   add_definitions(-DVK_USE_PLATFORM_MIR_KHR)
--#   set(DisplayServer Mir)
-+    if (BUILD_WSI_XLIB_SUPPORT)
-+        add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
-+    endif()
- 
--#   add_definitions(-DVK_USEPLATFORM_WAYLAND_KHR)
--#   set(DisplayServer Wayland)
-+    if (BUILD_WSI_WAYLAND_SUPPORT)
-+        add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
-+    endif()
- 
-+    if (BUILD_WSI_MIR_SUPPORT)
-+        add_definitions(-DVK_USE_PLATFORM_MIR_KHR)
-+    endif()
- else()
-     message(FATAL_ERROR "Unsupported Platform!")
- endif()
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/swapchain.cpp vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/swapchain.cpp
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/layers/swapchain.cpp	2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/layers/swapchain.cpp	2016-03-02 21:25:25.334464012 +0100
-@@ -222,6 +222,7 @@
- 
-             my_data->instanceMap[instance].androidSurfaceExtensionEnabled =
-                 true;
-+        }
- #endif // VK_USE_PLATFORM_ANDROID_KHR
- #ifdef VK_USE_PLATFORM_MIR_KHR
-             if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
-@@ -229,6 +230,7 @@
- 
-                 my_data->instanceMap[instance].mirSurfaceExtensionEnabled =
-                     true;
-+            }
- #endif // VK_USE_PLATFORM_MIR_KHR
- #ifdef VK_USE_PLATFORM_WAYLAND_KHR
-                 if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
-@@ -236,6 +238,7 @@
- 
-                     my_data->instanceMap[instance]
-                         .waylandSurfaceExtensionEnabled = true;
-+                }
- #endif // VK_USE_PLATFORM_WAYLAND_KHR
- #ifdef VK_USE_PLATFORM_WIN32_KHR
-                     if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
-@@ -243,6 +246,7 @@
- 
-                         my_data->instanceMap[instance]
-                             .win32SurfaceExtensionEnabled = true;
-+                    }
- #endif // VK_USE_PLATFORM_WIN32_KHR
- #ifdef VK_USE_PLATFORM_XCB_KHR
-                         if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
-@@ -250,6 +254,7 @@
- 
-                             my_data->instanceMap[instance]
-                                 .xcbSurfaceExtensionEnabled = true;
-+                        }
- #endif // VK_USE_PLATFORM_XCB_KHR
- #ifdef VK_USE_PLATFORM_XLIB_KHR
-                             if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
-@@ -258,8 +263,8 @@
- 
-                                 my_data->instanceMap[instance]
-                                     .xlibSurfaceExtensionEnabled = true;
--#endif // VK_USE_PLATFORM_XLIB_KHR
-                             }
-+#endif // VK_USE_PLATFORM_XLIB_KHR
-                         }
-                     }
- 
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/loader/loader.c vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/loader/loader.c
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/loader/loader.c	2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/loader/loader.c	2016-03-02 21:25:25.334464012 +0100
-@@ -1386,6 +1386,9 @@
- #ifdef VK_USE_PLATFORM_XCB_KHR
-     LOOKUP_GIPA(GetPhysicalDeviceXcbPresentationSupportKHR, false);
- #endif
-+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-+    LOOKUP_GIPA(GetPhysicalDeviceWaylandPresentationSupportKHR, false);
-+#endif
- 
- #undef LOOKUP_GIPA
- 
-diff -dur vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/loader/wsi.c vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/loader/wsi.c
---- vulkan-sdk-1.0.3.0.orig/Vulkan-LoaderAndValidationLayers/loader/wsi.c	2016-02-22 22:02:54.000000000 +0100
-+++ vulkan-sdk-1.0.3.0/Vulkan-LoaderAndValidationLayers/loader/wsi.c	2016-03-02 21:25:25.334464012 +0100
-@@ -623,7 +623,7 @@
-  */
- LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
- vkCreateWaylandSurfaceKHR(VkInstance instance,
--                          const VkMirSurfaceCreateInfoKHR *pCreateInfo,
-+                          const VkWaylandSurfaceCreateInfoKHR *pCreateInfo,
-                           const VkAllocationCallbacks *pAllocator,
-                           VkSurfaceKHR *pSurface) {
-     const VkLayerInstanceDispatchTable *disp;
-@@ -641,7 +641,7 @@
-  */
- VKAPI_ATTR VkResult VKAPI_CALL
- loader_CreateWaylandSurfaceKHR(VkInstance instance,
--                               const VkMirSurfaceCreateInfoKHR *pCreateInfo,
-+                               const VkWaylandSurfaceCreateInfoKHR *pCreateInfo,
-                                const VkAllocationCallbacks *pAllocator,
-                                VkSurfaceKHR *pSurface) {
-     struct loader_instance *ptr_instance = loader_get_instance(instance);
-@@ -1021,6 +1021,7 @@
-                     ? (void *)vkGetPhysicalDeviceMirPresentationSupportKHR
-                     : NULL;
-         return true;
-+    }
- #endif // VK_USE_PLATFORM_MIR_KHR
- #ifdef VK_USE_PLATFORM_WAYLAND_KHR
-         /*
-@@ -1038,6 +1039,7 @@
-                     ? (void *)vkGetPhysicalDeviceWaylandPresentationSupportKHR
-                     : NULL;
-             return true;
-+        }
- #endif // VK_USE_PLATFORM_WAYLAND_KHR
- #ifdef VK_USE_PLATFORM_XCB_KHR
-             /*
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/78da5abe0eb723d1aea72056ceb55d263cac3196



More information about the pld-cvs-commit mailing list