build: update spirv and glslang revisions

Updated to more recent SPIRV, SPIRV_headers, and glslang commits.
This also required updating the overall build to use a new
library SPVRemapper.lib.

Change-Id: I47573be7a1fe62c519f504920590ceb6510a7a13

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a781a96..602f01f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,6 +203,9 @@ find_library(HLSL_LIB NAMES HLSL
 find_library(SPIRV_LIB NAMES SPIRV
              HINTS ${GLSLANG_SEARCH_PATH} )
 
+find_library(SPIRV_REMAPPER_LIB NAMES SPVRemapper
+             HINTS ${GLSLANG_SEARCH_PATH} )
+
 find_library(SPIRV_TOOLS_LIB NAMES SPIRV-Tools
              HINTS ${SPIRV_TOOLS_SEARCH_PATH} )
 
@@ -212,6 +215,7 @@ if (WIN32)
     add_library(OSDependent STATIC IMPORTED)
     add_library(HLSL        STATIC IMPORTED)
     add_library(SPIRV       STATIC IMPORTED)
+    add_library(SPVRemapper       STATIC IMPORTED)
     add_library(Loader      STATIC IMPORTED)
     add_library(SPIRV-Tools STATIC IMPORTED)
 
@@ -225,6 +229,8 @@ if (WIN32)
                  HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
     find_library(SPIRV_DLIB NAMES SPIRVd
                  HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
+    find_library(SPIRV_REMAPPER_DLIB NAMES SPVRemapperd
+                 HINTS ${GLSLANG_DEBUG_SEARCH_PATH} )
     find_library(SPIRV_TOOLS_DLIB NAMES SPIRV-Tools
                  HINTS ${SPIRV_TOOLS_DEBUG_SEARCH_PATH} )
 
@@ -243,14 +249,17 @@ if (WIN32)
     set_target_properties(SPIRV PROPERTIES
                          IMPORTED_LOCATION       "${SPIRV_LIB}"
                          IMPORTED_LOCATION_DEBUG "${SPIRV_DLIB}")
+    set_target_properties(SPVRemapper PROPERTIES
+                         IMPORTED_LOCATION       "${SPIRV_REMAPPER_LIB}"
+                         IMPORTED_LOCATION_DEBUG "${SPIRV_REMAPPER_DLIB}")
     set_target_properties(SPIRV-Tools PROPERTIES
                          IMPORTED_LOCATION       "${SPIRV_TOOLS_LIB}"
                          IMPORTED_LOCATION_DEBUG "${SPIRV_TOOLS_DLIB}")
 
-    set (GLSLANG_LIBRARIES glslang OGLCompiler OSDependent HLSL SPIRV)
+    set (GLSLANG_LIBRARIES glslang OGLCompiler OSDependent HLSL SPIRV SPVRemapper)
     set (SPIRV_TOOLS_LIBRARIES SPIRV-Tools)
 else ()
-    set (GLSLANG_LIBRARIES ${GLSLANG_LIB} ${OGLCompiler_LIB} ${OSDependent_LIB} ${HLSL_LIB} ${SPIRV_LIB})
+    set (GLSLANG_LIBRARIES ${GLSLANG_LIB} ${OGLCompiler_LIB} ${OSDependent_LIB} ${HLSL_LIB} ${SPIRV_LIB} ${SPIRV_REMAPPER_LIB})
     set (SPIRV_TOOLS_LIBRARIES ${SPIRV_TOOLS_LIB})
 endif()
 

diff --git a/glslang_revision b/glslang_revision
index 9a03f5a..5c29602 100644 (file)
--- a/glslang_revision
+++ b/glslang_revision
@@ -1 +1 @@
-e4821e43c86d97bcf65fb07c1f70471b7102978d
+81cd764b5ffc475bc73f1fb35f75fd1171bb2343

diff --git a/spirv-headers_revision b/spirv-headers_revision
index 74846cc..349801d 100644 (file)
--- a/spirv-headers_revision
+++ b/spirv-headers_revision
@@ -1 +1 @@
-3814effb879ab5a98a7b9288a4b4c7849d2bc8ac
+33d41376d378761ed3a4c791fc4b647761897f26
\ No newline at end of file

diff --git a/spirv-tools_revision b/spirv-tools_revision
index 9aaac77..7e3bbc1 100644 (file)
--- a/spirv-tools_revision
+++ b/spirv-tools_revision
@@ -1 +1 @@
-6c61bf2dfadf70ab5fe1b0fb918ba03b7afa2396
+923a4596b44831a07060df45caacb522613730c9