|
|
@ -1,9 +1,9 @@
|
|
|
|
diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLists.txt
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt
|
|
|
|
--- glslang-sdk-1.3.250.1/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/CMakeLists.txt 2023-07-07 09:26:10.171395413 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000
|
|
|
|
@@ -104,6 +104,13 @@ else()
|
|
|
|
@@ -118,6 +118,13 @@ if(USE_CCACHE)
|
|
|
|
|
|
|
|
endif(CCACHE_FOUND)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
option(ENABLE_CTEST "Enables testing" 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)
|
|
|
@ -15,7 +15,7 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis
|
|
|
|
if(ENABLE_CTEST)
|
|
|
|
if(ENABLE_CTEST)
|
|
|
|
include(CTest)
|
|
|
|
include(CTest)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
@@ -282,11 +289,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
|
|
|
|
@@ -320,11 +327,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
|
|
|
|
add_subdirectory(External)
|
|
|
|
add_subdirectory(External)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
@ -28,9 +28,9 @@ diff -up glslang-sdk-1.3.250.1/CMakeLists.txt.dma glslang-sdk-1.3.250.1/CMakeLis
|
|
|
|
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
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt
|
|
|
|
--- glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/External/CMakeLists.txt 2023-07-07 09:26:10.172395432 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000
|
|
|
|
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
|
|
|
|
@@ -68,10 +68,3 @@ if(BUILD_TESTING)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
@ -42,21 +42,21 @@ diff -up glslang-sdk-1.3.250.1/External/CMakeLists.txt.dma glslang-sdk-1.3.250.1
|
|
|
|
- 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
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt
|
|
|
|
--- glslang-sdk-1.3.250.1/glslang/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/glslang/CMakeLists.txt 2023-07-07 09:26:10.173395450 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000
|
|
|
|
@@ -245,6 +245,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
|
|
|
@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
|
|
|
add_library(GenericCodeGen ALIAS glslang::GenericCodeGen)
|
|
|
|
EXPORT glslangTargets
|
|
|
|
|
|
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
")
|
|
|
|
|
|
|
|
+ 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()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
|
|
--- 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-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in
|
|
|
|
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma 2020-11-04 06:32:09.031326265 +1000
|
|
|
|
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in 2020-11-04 06:32:09.031326265 +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,10 +70,10 @@ 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.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt
|
|
|
|
--- glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt 2023-07-07 09:26:10.176395507 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000
|
|
|
|
@@ -82,6 +82,10 @@ target_include_directories(SPIRV PUBLIC
|
|
|
|
@@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC
|
|
|
|
|
|
|
|
|
|
|
|
glslang_add_build_info_dependency(SPIRV)
|
|
|
|
glslang_add_build_info_dependency(SPIRV)
|
|
|
|
|
|
|
|
|
|
|
@ -83,8 +83,8 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SP
|
|
|
|
+
|
|
|
|
+
|
|
|
|
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_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
|
|
|
@@ -98,15 +102,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
|
|
|
@@ -90,15 +94,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
@ -109,21 +109,20 @@ diff -up glslang-sdk-1.3.250.1/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.250.1/SP
|
|
|
|
+ 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(ENABLE_OPT)
|
|
|
|
|
|
|
|
@@ -133,6 +143,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
@@ -147,6 +157,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
|
|
|
|
|
|
|
add_library(SPIRV ALIAS glslang::SPIRV)
|
|
|
|
install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
|
|
")
|
|
|
|
|
|
|
|
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 ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
|
|
|
endif()
|
|
|
|
endif(ENABLE_GLSLANG_INSTALL)
|
|
|
|
diff -up glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in
|
|
|
|
--- glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in.dma 2023-07-07 09:26:10.177395526 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma 2020-11-04 06:32:09.032326292 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/SPIRV/spirv.pc.cmake.in 2023-07-07 09:26:10.177395526 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in 2020-11-04 06:32:09.031326265 +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 +136,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.250.1/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp
|
|
|
|
--- glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma 2020-11-04 06:32:09.032326292 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/SPIRV/SpvTools.cpp 2023-07-07 09:26:10.178395545 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp 2020-11-04 06:33:06.481878394 +1000
|
|
|
|
@@ -43,7 +43,7 @@
|
|
|
|
@@ -43,7 +43,7 @@
|
|
|
|
#include <iostream>
|
|
|
|
#include <iostream>
|
|
|
|
|
|
|
|
|
|
|
@ -149,10 +148,10 @@ 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.250.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt
|
|
|
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt
|
|
|
|
--- glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma 2023-06-28 03:49:14.000000000 +1000
|
|
|
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma 2020-11-04 06:31:49.139788864 +1000
|
|
|
|
+++ glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt 2023-07-07 09:26:10.179395564 +1000
|
|
|
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt 2020-11-04 06:32:09.032326292 +1000
|
|
|
|
@@ -62,6 +62,14 @@ if(ENABLE_SPVREMAPPER)
|
|
|
|
@@ -56,6 +56,14 @@ if(ENABLE_SPVREMAPPER)
|
|
|
|
set(LIBRARIES ${LIBRARIES} SPVRemapper)
|
|
|
|
set(LIBRARIES ${LIBRARIES} SPVRemapper)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
@ -167,8 +166,8 @@ diff -up glslang-sdk-1.3.250.1/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.250
|
|
|
|
if(WIN32)
|
|
|
|
if(WIN32)
|
|
|
|
set(LIBRARIES ${LIBRARIES} psapi)
|
|
|
|
set(LIBRARIES ${LIBRARIES} psapi)
|
|
|
|
elseif(UNIX)
|
|
|
|
elseif(UNIX)
|
|
|
|
@@ -71,9 +79,6 @@ elseif(UNIX)
|
|
|
|
@@ -65,9 +73,6 @@ elseif(UNIX)
|
|
|
|
endif()
|
|
|
|
endif(WIN32)
|
|
|
|
|
|
|
|
|
|
|
|
target_link_libraries(glslangValidator ${LIBRARIES})
|
|
|
|
target_link_libraries(glslangValidator ${LIBRARIES})
|
|
|
|
-target_include_directories(glslangValidator PUBLIC
|
|
|
|
-target_include_directories(glslangValidator PUBLIC
|
|
|
|