@ -1,9 +1,9 @@
diff -up glslang-sdk-1.3.2 50.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1 /CMakeLists.txt
diff -up glslang-sdk-1.3.2 75.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0 /CMakeLists.txt
--- glslang-sdk-1.3.2 50.1/CMakeLists.txt.dma 2023-06-28 03:49:14 .000000000 +1000
--- glslang-sdk-1.3.2 75.0/CMakeLists.txt.dma 2023-08-09 04:49:36 .000000000 +1000
+++ glslang-sdk-1.3.2 50.1/CMakeLists.txt 2023-07-07 09:26:10.171395413 +1000
+++ glslang-sdk-1.3.2 75.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000
@@ -10 4,6 +104,13 @@ else ()
@@ -10 6,6 +106,13 @@ endif ()
endif()
option(ENABLE_CTEST "Enables testing " ON)
option(ENABLE_PCH "Enables Precompiled header " ON)
+# using pkg-config to configure include paths and link libraries
+# using pkg-config to configure include paths and link libraries
+include(FindPkgConfig)
+include(FindPkgConfig)
@ -12,51 +12,79 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis
+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
+endif(BUILD_SHARED_LIBS)
+endif(BUILD_SHARED_LIBS)
+
+
if(ENABLE_CTEST )
if(ENABLE_HLSL )
include(CTest )
add_compile_definitions(ENABLE_HLSL )
endif()
endif()
@@ -2 82,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
@@ -2 64,27 +271,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
add_subdirectory(External)
add_subdirectory(External)
endif()
endif()
-option(ALLOW_EXTERNAL_SPIRV_TOOLS "Allows to build against installed SPIRV-Tools-opt. This is unsupported if the commit isn't the one in known_good.json")
-if(NOT TARGET SPIRV-Tools-opt)
- if(ALLOW_EXTERNAL_SPIRV_TOOLS)
- # Look for external SPIR-V Tools build, if not building in-tree
- message(STATUS "Trying to find local SPIR-V tools")
- find_package(SPIRV-Tools-opt)
- if(NOT TARGET SPIRV-Tools-opt)
- if(NOT TARGET SPIRV-Tools-opt)
- if(ENABLE_OPT)
- message(WARNING "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.")
- endif()
- set(ENABLE_OPT OFF)
- set(ENABLE_OPT OFF)
- endif()
- endif()
- else()
- if(ENABLE_OPT)
- message(SEND_ERROR "ENABLE_OPT set but SPIR-V tools not found. Please run update_glslang_sources.py, "
- "set the ALLOW_EXTERNAL_SPIRV_TOOLS option to use a local install of SPIRV-Tools, or set ENABLE_OPT=0.")
- endif()
- endif()
-endif()
-
-
-if(ENABLE_OPT)
-if(ENABLE_OPT)
+if(${SPIRV_TOOLS_FOUND} EQUAL 1)
+if(${SPIRV_TOOLS_FOUND} EQUAL 1)
message(STATUS "optimizer enabled")
message(STATUS "optimizer enabled")
add_definitions(-DENABLE_OPT=1)
add_definitions(-DENABLE_OPT=1)
else()
else()
diff -up glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma glslang-sdk-1.3.250.1/External/CMakeLists.txt
@@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL)
--- glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[
+++ glslang-sdk-1.3.250.1/External/CMakeLists.txt 2023-07-07 09:26:10.172395432 +1000
@PACKAGE_INIT@
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
include(CMakeFindDependencyMacro)
- if(@ENABLE_OPT@)
- find_dependency(SPIRV-Tools-opt)
- endif()
@INSTALL_CONFIG_UNIX@
include("@PACKAGE_PATH_EXPORT_TARGETS@")
]=])
diff -up glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma glslang-sdk-1.3.275.0/External/CMakeLists.txt
--- glslang-sdk-1.3.275.0/External/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
+++ glslang-sdk-1.3.275.0/External/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000
@@ -68,10 +68,4 @@ if(GLSLANG_TESTS)
endif()
endif()
endif()
endif()
-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools)
- add_subdirectory( spirv-tools)
- endif()
- endif()
-endif()
-endif()
-
diff -up glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma glslang-sdk-1.3.250.1/glslang/CMakeLists.txt
--- glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
diff -up glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.275.0/glslang/CMakeLists.txt
+++ glslang-sdk-1.3.250.1/glslang/CMakeLists.txt 2023-07-07 09:26:10.173395450 +1000
--- glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL)
+++ glslang-sdk-1.3.275.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000
add_library(GenericCodeGen ALIAS glslang::GenericCodeGen)
@@ -232,6 +232,8 @@ if(GLSLANG_ENABLE_INSTALL)
endif()
if(NOT BUILD_SHARED_LIBS)
")
install(TARGETS MachineIndependent EXPORT glslang-targets)
install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
endif()
endif()
diff -up glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in
set(PUBLIC_HEADERS
--- glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma 2023-07-07 09:26:10.174395469 +1000
+++ glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in 2023-07-07 09:26:10.174395469 +1000
diff -up glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in
--- glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in.dma 2023-09-05 13:21:45.115297852 +1000
+++ glslang-sdk-1.3.275.0/glslang/glslang.pc.cmake.in 2023-09-05 13:21:45.115297852 +1000
@@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -70,21 +98,21 @@ diff -up glslang-sdk-1.3.250.1/glslang/glslang.pc.cmake.in.dma glslang-sdk-1.3.2
+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
+ Cflags: -I${includedir}
+ Cflags: -I${includedir}
\ No newline at end of file
\ No newline at end of file
diff -up glslang-sdk-1.3.2 50.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1 /SPIRV/CMakeLists.txt
diff -up glslang-sdk-1.3.2 75.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0 /SPIRV/CMakeLists.txt
--- glslang-sdk-1.3.2 50.1/SPIRV/CMakeLists.txt.dma 2023-06-28 03:49:14 .000000000 +1000
--- glslang-sdk-1.3.2 75.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36 .000000000 +1000
+++ glslang-sdk-1.3.2 50.1/SPIRV/CMakeLists.txt 2023-07-07 09:26:10.176395507 +1000
+++ glslang-sdk-1.3.2 75.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000
@@ -8 2,6 +82 ,10 @@ target_include_directories(SPIRV PUBLIC
@@ -8 9,6 +89 ,10 @@ target_include_directories(SPIRV PUBLIC
glslang_add_build_info_dependency(SPIRV)
glslang_add_build_info_dependency(SPIRV)
+
+
+set(SPIRV_NAME spirv)
+set(SPIRV_NAME spirv)
+set(SPIRV_VERSION 1. 3 )
+set(SPIRV_VERSION 1. 5.5 )
+
+
if (ENABLE_SPVREMAPPER)
if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
set_target_properties(SPVRemapper PROPERTIES
set_target_properties(SPVRemapper PROPERTIES
@@ - 98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
@@ - 105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
endif()
endif()
endif()
endif()
@ -98,32 +126,26 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SP
+endif(BUILD_SHARED_LIBS)
+endif(BUILD_SHARED_LIBS)
+
+
if(ENABLE_OPT)
if(ENABLE_OPT)
target_include_directories(SPIRV
- target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
PRIVATE ${spirv-tools_SOURCE_DIR}/include
PRIVATE ${spirv-tools_SOURCE_DIR}/source
)
- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
- target_include_directories(SPIRV PUBLIC
- target_include_directories(SPIRV PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+ target_link_libraries(SPIRV glslang)
+ target_link_libraries(SPIRV glslang)
else()
else()
target_link_libraries(SPIRV PRIVATE MachineIndependent)
target_link_libraries(SPIRV PRIVATE MachineIndependent)
endif()
endif()
@@ -147,6 +157,9 @@ if(ENABLE_GLSLANG_INSTALL)
@@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL)
add_library(SPIRV ALIAS glslang::SPIRV)
")
install(TARGETS SPIRV EXPORT glslang-targets)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SPIRVTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
+ # spirv.pc Configuration
+ # spirv.pc Configuration
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+
install(FILES ${HEADERS} ${SPVREMAP _HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
install(FILES ${PUBLIC _HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
endif()
endif()
diff -up glslang-sdk-1.3.2 50.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.1 /SPIRV/spirv.pc.cmake.in
diff -up glslang-sdk-1.3.2 75.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0 /SPIRV/spirv.pc.cmake.in
--- glslang-sdk-1.3.2 50.1/SPIRV/spirv.pc.cmake.in.dma 2023-07-07 09:26:10.177395526 +1000
--- glslang-sdk-1.3.2 75.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000
+++ glslang-sdk-1.3.2 50.1/SPIRV/spirv.pc.cmake.in 2023-07-07 09:26:10.177395526 +1000
+++ glslang-sdk-1.3.2 75.0/SPIRV/spirv.pc.cmake.in 2023-09-05 13:21:45.116297879 +1000
@@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
@ -137,9 +159,9 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.1
+ Libs: -L${libdir} -lSPIRV
+ Libs: -L${libdir} -lSPIRV
+ Cflags: -I${includedir}
+ Cflags: -I${includedir}
\ No newline at end of file
\ No newline at end of file
diff -up glslang-sdk-1.3.2 50.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1 /SPIRV/SpvTools.cpp
diff -up glslang-sdk-1.3.2 75.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0 /SPIRV/SpvTools.cpp
--- glslang-sdk-1.3.2 50.1/SPIRV/SpvTools.cpp.dma 2023-06-28 03:49:14 .000000000 +1000
--- glslang-sdk-1.3.2 75.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36 .000000000 +1000
+++ glslang-sdk-1.3.2 50.1/SPIRV/SpvTools.cpp 2023-07-07 09:26:10.178395545 +1000
+++ glslang-sdk-1.3.2 75.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000
@@ -43,7 +43,7 @@
@@ -43,7 +43,7 @@
#include <iostream>
#include <iostream>
@ -149,31 +171,30 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIR
namespace glslang {
namespace glslang {
diff -up glslang-sdk-1.3.2 50.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.1 /StandAlone/CMakeLists.txt
diff -up glslang-sdk-1.3.2 75.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275.0 /StandAlone/CMakeLists.txt
--- glslang-sdk-1.3.2 50.1/StandAlone/CMakeLists.txt.dma 2023-06-28 03:49:14 .000000000 +1000
--- glslang-sdk-1.3.2 75.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36 .000000000 +1000
+++ glslang-sdk-1.3.2 50.1/StandAlone/CMakeLists.txt 2023-07-07 09:26:10.179395564 +1000
+++ glslang-sdk-1.3.2 75.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000
@@ -6 2,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
@@ -6 3,6 +63,14 @@ set(LIBRARIES
set(LIBRARIES ${LIBRARIES} SPVRemapper)
SPIRV
endif( )
glslang-default-resource-limits )
+if(BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
+ target_include_directories(glslang Validator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
+ target_include_directories(glslang -standalone PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
+else()
+else()
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES})
+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES})
+ target_include_directories(glslang Validator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
+ target_include_directories(glslang -standalone PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
+endif(BUILD_SHARED_LIBS)
+endif(BUILD_SHARED_LIBS)
+
+
if(WIN32)
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)
set(LIBRARIES ${LIBRARIES} psapi)
elseif(UNIX)
elseif(UNIX)
@@ -7 1,9 +79 ,6 @@ elseif(UNIX)
@@ -7 2,8 +80 ,6 @@ elseif(UNIX)
endif()
endif()
target_link_libraries(glslangValidator ${LIBRARIES})
target_link_libraries(glslang-standalone ${LIBRARIES})
-target_include_directories(glslangValidator PUBLIC
-target_include_directories(glslang-standalone PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
if(ENABLE_OPT )
if(ENABLE_SPVREMAPPER )
target_include_directories(glslangValidator
set(REMAPPER_SOURCES spirv-remap.cpp)