system_glslang_and_spirv-tools.patch

   1 diff -dur vulkan-sdk-1.0.8.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.8.0/VulkanTools/CMakeLists.txt
   2 --- vulkan-sdk-1.0.8.0.orig/VulkanTools/CMakeLists.txt  2016-04-07 18:04:06.000000000 +0200
   3 +++ vulkan-sdk-1.0.8.0/VulkanTools/CMakeLists.txt       2016-04-08 17:29:12.705768040 +0200
   4 @@ -103,13 +103,14 @@
   5  option(BUILD_VKTRACE "Build VkTrace" ON)
   6  option(BUILD_VKJSON "Build vkjson" ON)
   7
   8 -if (BUILD_ICD OR BUILD_TESTS)
   9      find_program(GLSLANG_VALIDATOR NAMES glslangValidator
  10 -                 HINTS "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/install/bin"
  11 +                 HINTS "/usr/bin"
  12 +                       "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/install/bin"
  13                         "${PROJECT_SOURCE_DIR}/../${BINDATA_DIR}" )
  14
  15 -    find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${CMAKE_SOURCE_DIR}/../glslang" DOC "Path to SPIRV/spirv.hpp")
  16 -    find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
  17 +    find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include/glslang" "${CMAKE_SOURCE_DIR}/../glslang" DOC "Path to SPIRV/spirv.hpp")
  18 +    find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include"
  19 +                                                                  "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
  20                                                                     "${CMAKE_SOURCE_DIR}/../source/spirv-tools/include"
  21                                                                     "${CMAKE_SOURCE_DIR}/../spirv-tools/external/include"
  22                                                                     "${CMAKE_SOURCE_DIR}/../source/spirv-tools/external/include"
  23 @@ -122,8 +123,8 @@
  24                                   "${CMAKE_SOURCE_DIR}/../glslang/${BUILDTGT_DIR}/SPIRV/Release" )
  25          set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/${BUILDTGT_DIR}/source/Release")
  26      else()
  27 -        set (GLSLANG_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../glslang/build/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
  28 -        set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_SOURCE_DIR}/../spirv-tools/build/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
  29 +        set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_SOURCE_DIR}/../glslang/build/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
  30 +       set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_SOURCE_DIR}/../spirv-tools/build/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
  31      endif()
  32
  33      find_library(GLSLANG_LIB NAMES glslang
  34 @@ -189,7 +190,6 @@
  35          set (GLSLANG_LIBRARIES ${GLSLANG_LIB} ${OGLCompiler_LIB} ${OSDependent_LIB} ${SPIRV_LIB})
  36          set (SPIRV_TOOLS_LIBRARIES ${SPIRV_TOOLS_LIB})
  37      endif()
  38 -endif()
  39
  40  if (BUILD_ICD)
  41      # Hard code our LunarGLASS path for now
  42 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
  43 --- vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/CMakeLists.txt      2016-04-07 18:04:06.000000000 +0200
  44 +++ vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/CMakeLists.txt   2016-04-08 17:29:00.568752815 +0200
  45 @@ -10,7 +10,7 @@
  46  macro(glsl_to_spirv src)
  47      add_custom_command(OUTPUT ${src}.h
  48          COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
  49 -        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
  50 +        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
  51          )
  52  endmacro()
  53
  54 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
  55 --- vulkan-sdk-1.0.8.0.orig/VulkanTools/demos/smoke/glsl-to-spirv       2016-04-07 18:04:06.000000000 +0200
  56 +++ vulkan-sdk-1.0.8.0/VulkanTools/demos/smoke/glsl-to-spirv    2016-04-08 17:29:00.568752815 +0200
  57 @@ -38,7 +38,7 @@
  58  in_filename = sys.argv[1]
  59  out_filename = sys.argv[2] if len(sys.argv) > 2 else None
  60  validator = sys.argv[3] if len(sys.argv) > 3 else \
  61 -        "../../../glslang/build/install/bin/glslangValidator"
  62 +        "glslangValidator"
  63
  64  def identifierize(s):
  65      # translate invalid chars