system_glslang_and_spirv-tools.patch

   1 diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt VulkanTools-sdk-1.0.32.0/CMakeLists.txt
   2 --- VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt        2016-11-10 18:52:27.000000000 +0100
   3 +++ VulkanTools-sdk-1.0.32.0/CMakeLists.txt     2016-11-23 14:15:38.000000000 +0100
   4 @@ -189,7 +189,7 @@
   5  else()
   6      #non windows
   7      if(CUSTOM_GLSLANG_BIN_ROOT)
   8 -        set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
   9 +       set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
  10                                   "${GLSLANG_BINARY_ROOT}/glslang"
  11                                   "${GLSLANG_BINARY_ROOT}/glslang/OSDependent/Unix"
  12                                   "${GLSLANG_BINARY_ROOT}/OGLCompilersDLL"
  13 @@ -197,26 +197,27 @@
  14                                   "${GLSLANG_BINARY_ROOT}/hlsl"
  15                                   "${GLSLANG_BINARY_ROOT}/StandAlone")
  16      else()
  17 -        set (GLSLANG_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
  18 +       set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
  19      endif()
  20
  21      if(CUSTOM_SPIRV_TOOLS_BIN_ROOT)
  22          set (SPIRV_TOOLS_SEARCH_PATH "${SPIRV_TOOLS_BINARY_ROOT}/source" )
  23      else()
  24 -        set (SPIRV_TOOLS_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
  25 +        set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
  26      endif()
  27  endif()
  28
  29  find_program(GLSLANG_VALIDATOR NAMES glslangValidator
  30 -             HINTS "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
  31 +             HINTS "/usr/bin"
  32 +                  "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
  33                     "${GLSLANG_BINARY_ROOT}/StandAlone"
  34                     "${PROJECT_SOURCE_DIR}/external/${BINDATA_DIR}")
  35
  36 -find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${EXTERNAL_SOURCE_ROOT}/glslang"
  37 +find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include/glslang" "${EXTERNAL_SOURCE_ROOT}/glslang"
  38                                                      "${CMAKE_SOURCE_DIR}/../glslang"
  39                                                DOC "Path to SPIRV/spirv.hpp")
  40
  41 -find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
  42 +find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
  43                                                     "${EXTERNAL_SOURCE_ROOT}/SPIRV-Tools/include"
  44                                                     "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
  45                                                     "${CMAKE_SOURCE_DIR}/../SPIRV-Tools/include"
  46 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
  47 --- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt    2016-11-10 18:52:27.000000000 +0100
  48 +++ VulkanTools-sdk-1.0.32.0/demos/smoke/CMakeLists.txt 2016-11-23 14:15:38.000000000 +0100
  49 @@ -10,7 +10,7 @@
  50  macro(glsl_to_spirv src)
  51      add_custom_command(OUTPUT ${src}.h
  52          COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
  53 -        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
  54 +        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
  55          )
  56  endmacro()
  57
  58 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
  59 --- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/glsl-to-spirv     2016-11-10 18:52:27.000000000 +0100
  60 +++ VulkanTools-sdk-1.0.32.0/demos/smoke/glsl-to-spirv  2016-11-23 14:15:38.000000000 +0100
  61 @@ -32,7 +32,7 @@
  62  in_filename = sys.argv[1]
  63  out_filename = sys.argv[2] if len(sys.argv) > 2 else None
  64  validator = sys.argv[3] if len(sys.argv) > 3 else \
  65 -        "../../../glslang/build/install/bin/glslangValidator"
  66 +        "glslangValidator"
  67
  68  def identifierize(s):
  69      # translate invalid chars