[glslang] Update to 11.1.0 (#15719)

* [shaderc] remove port since it does not build

* [glslang] updated to version 11.1.0

* [glslang] Add python path

* [glslang] baseline.json and glslang.json updated

* Update portfile.cmake

* Update CONTROL

* Update port_versions

* Update port_versions

* Update port_versions

* Update port_versions

* Update port_versions

* [glslang] port update to version 11.4.0

* [glslang] port version removed from json

* [glslang] remove shaderc

* [glslang] baseline update

* [glslang] versions hash update

* [glslang] portfile format fix + use of ${PORT}

* [glslang] new hash

* [glslang] revert portfile back

* [glslang] portfile apply changes

* [glslang] update hash for x86 windows

* [glslang] update to 1.5.0

* [glslang] git-tree hash update

* [glslang] remove old version 1.4.0

* [glslang] git-tree hash update

* [glslang][shaderc] Update and fix targets to match upstream

* Update versions

Co-authored-by: Lukas Lipp <llipp@cg.tuwien.ac.at>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>

10 files changed, 60 insertions, 144 deletions

diff --git a/ports/shaderc/CMakeLists.txt b/ports/shaderc/CMakeLists.txt
deleted file mode 100644
index 7ecdd03f9..000000000
--- a/ports/shaderc/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D})

-if(NOT SUFFIX_D)

-    find_library(GLSLANG glslang)

-    find_library(OSDEPENDENT OSDependent)

-    find_library(OGLCOMPILER OGLCompiler)

-    find_library(HLSLLIB HLSL)

-    find_library(SPIRVLIB SPIRV)

-ELSE()

-    find_library(GLSLANG glslangd)

-    find_library(OSDEPENDENT OSDependentd)

-    find_library(OGLCOMPILER OGLCompilerd)

-    find_library(HLSLLIB HLSLd)

-    find_library(SPIRVLIB SPIRVd)

-ENDIF()

-

-add_library(glslang STATIC IMPORTED GLOBAL)

-set_property(TARGET glslang PROPERTY IMPORTED_LOCATION "${GLSLANG}")

-find_path(glslang_SOURCE_DIR glslang/Include/Common)

-set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${glslang_SOURCE_DIR}")

-

-add_library(OSDependent STATIC IMPORTED GLOBAL)

-set_property(TARGET OSDependent PROPERTY IMPORTED_LOCATION "${OSDEPENDENT}")

-

-add_library(OGLCompiler STATIC IMPORTED GLOBAL)

-set_property(TARGET OGLCompiler PROPERTY IMPORTED_LOCATION "${OGLCOMPILER}")

-

-add_library(HLSL STATIC IMPORTED GLOBAL)

-set_property(TARGET HLSL PROPERTY IMPORTED_LOCATION "${HLSLLIB}")

-

-add_library(SPIRV STATIC IMPORTED GLOBAL)

-set_property(TARGET SPIRV PROPERTY IMPORTED_LOCATION "${SPIRVLIB}")

diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL
deleted file mode 100644
index e700a4010..000000000
--- a/ports/shaderc/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: shaderc
-Version: 2019-06-26
-Port-Version: 2
-Homepage: https://github.com/google/shaderc
-Description: A collection of tools, libraries and tests for shader compilation.
-Build-Depends: glslang, spirv-tools
\ No newline at end of file
diff --git a/ports/shaderc/build-version.inc b/ports/shaderc/build-version.inc
index 00c140577..d5b1449e2 100644
--- a/ports/shaderc/build-version.inc
+++ b/ports/shaderc/build-version.inc
@@ -1,5 +1 @@
-"shaderc v2019.0-dev unknown hash, 2019-05-08\n" 
-"spirv-tools v2019.3-dev unknown hash, 2019-04-03\n" 
-"glslang unknown hash, 2019-03-05\n"
-
-
+"shaderc v2021.1-dev unknown hash, 2021-06-21\n"
diff --git a/ports/shaderc/disable-update-version.patch b/ports/shaderc/disable-update-version.patch
index 5ee016bcb..7bf47bd50 100644
--- a/ports/shaderc/disable-update-version.patch
+++ b/ports/shaderc/disable-update-version.patch
@@ -2,19 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index a4e779b..dc5f1a9 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -81,12 +81,6 @@ add_subdirectory(libshaderc)

- add_subdirectory(glslc)

- add_subdirectory(examples)

+@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES})

+     add_subdirectory(examples)

+ endif()

  

 -add_custom_target(build-version

 -  ${PYTHON_EXECUTABLE}

 -  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py

--  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR}

+-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc

 -  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")

--

+ 

  function(define_pkg_config_file NAME LIBS)

    add_custom_target(${NAME}-pkg-config ALL

-     COMMAND ${CMAKE_COMMAND}

 diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt

 index acf6fb0..d0df7db 100644

 --- a/glslc/CMakeLists.txt

@@ -27,15 +26,3 @@ index acf6fb0..d0df7db 100644
  

  shaderc_add_tests(

    TEST_PREFIX glslc

-diff --git a/spvc/CMakeLists.txt b/spvc/CMakeLists.txt

-index f465972..76f8c2e 100644

---- a/spvc/CMakeLists.txt

-+++ b/spvc/CMakeLists.txt

-@@ -3,7 +3,6 @@ shaderc_default_compile_options(spvc_exe)

- target_include_directories(spvc_exe PRIVATE ${shaderc_SOURCE_DIR}/libshaderc/include ${spirv-tools_SOURCE_DIR}/include)

- set_target_properties(spvc_exe PROPERTIES OUTPUT_NAME spvc)

- target_link_libraries(spvc_exe PRIVATE shaderc_spvc shaderc_util)

--add_dependencies(spvc_exe build-version)

- 

- shaderc_add_asciidoc(spvc_doc_README README)

- 

diff --git a/ports/shaderc/fix-build-type.patch b/ports/shaderc/fix-build-type.patch
index 959610e3b..8e5cd22db 100644
--- a/ports/shaderc/fix-build-type.patch
+++ b/ports/shaderc/fix-build-type.patch
@@ -1,85 +1,67 @@
 diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
-index 0ffa06f..3476170 100644
+index 3ada419..f3277f0 100644
 --- a/libshaderc/CMakeLists.txt
 +++ b/libshaderc/CMakeLists.txt
-@@ -10,10 +10,11 @@ set(SHADERC_SOURCES
+@@ -24,13 +24,16 @@ set(SHADERC_SOURCES
    src/shaderc_private.h
  )
  
 +if (NOT BUILD_SHARED_LIBS)
  add_library(shaderc STATIC ${SHADERC_SOURCES})
  shaderc_default_compile_options(shaderc)
- target_include_directories(shaderc PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
--
+ target_include_directories(shaderc
+     PUBLIC include
+     PRIVATE ${glslang_SOURCE_DIR}
+             ${SPIRV-Headers_SOURCE_DIR}/include)
++set(shaderc_install_target shaderc)
+ 
 +else()
  add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
  shaderc_default_compile_options(shaderc_shared)
- target_include_directories(shaderc_shared PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
-@@ -22,6 +23,7 @@ target_compile_definitions(shaderc_shared
+ target_include_directories(shaderc_shared
+@@ -42,6 +45,8 @@ target_compile_definitions(shaderc_shared
      PUBLIC SHADERC_SHAREDLIB
  )
  set_target_properties(shaderc_shared PROPERTIES SOVERSION 1)
++set(shaderc_install_target shaderc_shared)
 +endif()
  
  if(SHADERC_ENABLE_INSTALL)
    install(
-@@ -34,10 +36,17 @@ if(SHADERC_ENABLE_INSTALL)
+@@ -54,7 +59,7 @@ if(SHADERC_ENABLE_INSTALL)
      DESTINATION
        ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
  
 -  install(TARGETS shaderc shaderc_shared
-+  if (NOT BUILD_SHARED_LIBS)
-+  install(TARGETS shaderc
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+  else()
-+  install(TARGETS shaderc_shared
++  install(TARGETS ${shaderc_install_target}
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+  endif()  
- endif(SHADERC_ENABLE_INSTALL)
- 
- find_package(Threads)
-@@ -47,10 +56,13 @@ set(SHADERC_LIBS
-   SPIRV # from glslang
+@@ -68,8 +73,11 @@ set(SHADERC_LIBS
    SPIRV-Tools
  )
--
-+if (NOT BUILD_SHARED_LIBS)
+ 
++if(NOT BUILD_SHARED_LIBS)
  target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
 +else()
  target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
 +endif()
  
-+if (NOT BUILD_SHARED_LIBS)
  shaderc_add_tests(
    TEST_PREFIX shaderc
-   LINK_LIBS shaderc
-@@ -60,7 +72,7 @@ shaderc_add_tests(
-     shaderc
+@@ -93,6 +101,7 @@ shaderc_add_tests(
      shaderc_cpp
      shaderc_private)
--
-+else()
- shaderc_add_tests(
-   TEST_PREFIX shaderc_shared
-   LINK_LIBS shaderc_shared SPIRV-Tools
-@@ -70,7 +82,9 @@ shaderc_add_tests(
-     shaderc
-     shaderc_cpp
-     shaderc_private)
--
-+endif()
-+# Do not combine all dependencies to static library
-+if (0)
+ 
++if(0)
  shaderc_combine_static_lib(shaderc_combined shaderc)
  
  if(SHADERC_ENABLE_INSTALL)
-@@ -106,3 +120,4 @@ if(${SHADERC_ENABLE_TESTS})
-   target_link_libraries(shaderc_c_smoke_test PRIVATE shaderc)
-   add_test(NAME shaderc_c_smoke_test COMMAND shaderc_c_smoke_test)
- endif()
+@@ -121,6 +130,7 @@ shaderc_add_tests(
+   TEST_NAMES
+     shaderc
+     shaderc_cpp)
 +endif()
-\ No newline at end of file
+ 
+ if(${SHADERC_ENABLE_TESTS})
+   add_executable(shaderc_c_smoke_test ./src/shaderc_c_smoke_test.c)
diff --git a/ports/shaderc/fix-install.patch b/ports/shaderc/fix-install.patch
deleted file mode 100644
index 1857ed8fe..000000000
--- a/ports/shaderc/fix-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt

-index 9d07136..0ffa06f 100644

---- a/libshaderc/CMakeLists.txt

-+++ b/libshaderc/CMakeLists.txt

-@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL)

-     # around this problem by manually substitution.

-     string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}"

-       install_location "${generated_location}")

--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-+    install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-   else()

-     install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-   endif()

-diff --git a/libshaderc_spvc/CMakeLists.txt b/libshaderc_spvc/CMakeLists.txt

-index fae235e..b503e70 100644

---- a/libshaderc_spvc/CMakeLists.txt

-+++ b/libshaderc_spvc/CMakeLists.txt

-@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL)

-     # around this problem by manually substitution.

-     string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}"

-       install_location "${generated_location}")

--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-+    install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-   else()

-     install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR})

-   endif()

diff --git a/ports/shaderc/glslang/CMakeLists.txt b/ports/shaderc/glslang/CMakeLists.txt
new file mode 100644
index 000000000..0e745779d
--- /dev/null
+++ b/ports/shaderc/glslang/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.11)

+

+find_package(glslang CONFIG REQUIRED)

+

+set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE)

+set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE)

+set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE)

+set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE)

+set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE)

+set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE)

+

+find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h)

+set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE)

diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake
index 40005d52b..7d9596781 100644
--- a/ports/shaderc/portfile.cmake
+++ b/ports/shaderc/portfile.cmake
@@ -4,20 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/shaderc
-    REF 05c766a1f4615ee37d37d09271aaabca30ffd293
-    SHA512 329697e8e23d619313440d57ef740a94c49d13533e1b8734fc8ff72fd5092c2addabb306f64cb69160fa5fee373a05ba39a5ee6d92d95e5e2e9c7ec96a51aadc
+    REF adca18dcadd460eb517fe44f6cd2460fa0650ebe
+    SHA512 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf
     HEAD_REF master
     PATCHES 
         disable-update-version.patch
-        fix-install.patch
         fix-build-type.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/third_party/glslang)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_spirv.txt DESTINATION ${SOURCE_PATH}/third_party/spirv-tools)
-file(RENAME ${SOURCE_PATH}/third_party/spirv-tools/CMakeLists_spirv.txt ${SOURCE_PATH}/third_party/spirv-tools/CMakeLists.txt)
-
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src)
 
 set(OPTIONS)
@@ -36,12 +30,9 @@ vcpkg_configure_cmake(
     OPTIONS
         ${OPTIONS}
         -DSHADERC_SKIP_TESTS=true 
-        -Dglslang_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include
-        -Dspirv-tools_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include 
-    OPTIONS_DEBUG
-        -DSUFFIX_D=true
-    OPTIONS_RELEASE
-        -DSUFFIX_D=false
+        -DSHADERC_GLSLANG_DIR=${CMAKE_CURRENT_LIST_DIR}/glslang
+        -DSHADERC_SPIRV_TOOLS_DIR=${CMAKE_CURRENT_LIST_DIR}/spirv-tools
+        -DSHADERC_ENABLE_EXAMPLES=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/shaderc/CMakeLists_spirv.txt b/ports/shaderc/spirv-tools/CMakeLists.txt
index d9e013601..d9e013601 100644
--- a/ports/shaderc/CMakeLists_spirv.txt
+++ b/ports/shaderc/spirv-tools/CMakeLists.txt
diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json
new file mode 100644
index 000000000..9d7b57a13
--- /dev/null
+++ b/ports/shaderc/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "shaderc",
+  "version": "2021.1",
+  "description": "A collection of tools, libraries and tests for shader compilation.",
+  "homepage": "https://github.com/google/shaderc",
+  "dependencies": [
+    "glslang",
+    "spirv-tools"
+  ]
+}