]> git.pld-linux.org Git - packages/vulkan-sdk.git/blobdiff - system_glslang_and_spirv-tools.patch
projects / packages / vulkan-sdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Version: 1.0.32.0, drop extra sources and icd
[packages/vulkan-sdk.git] / system_glslang_and_spirv-tools.patch
diff --git a/system_glslang_and_spirv-tools.patch b/system_glslang_and_spirv-tools.patch
index 0aae65b42295c3d057dd01becacb52b76285d525..b02eb641ed3609ae149314a640ff9301edf4f42c 100644 (file)
--- a/system_glslang_and_spirv-tools.patch
+++ b/system_glslang_and_spirv-tools.patch
@@ -1,47 +1,51 @@
-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' 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 @@
+                                  "${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' 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
 @@ -10,7 +10,7 @@
  macro(glsl_to_spirv src)
      add_custom_command(OUTPUT ${src}.h
@@ -51,10 +55,10 @@ diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-
          )
  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 @@
+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
+@@ -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 \
LunarG Vulkan SDK
This page took 0.064268 seconds and 4 git commands to generate.