Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/glslang-07a55839eed550d84ef62e0c7f503e0d67692708.tar.gz
|
SOURCES/glslang-sdk-1.3.283.0.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
a62e7be79f6d0be94c90922f839c2f01020ba9a5 SOURCES/glslang-07a55839eed550d84ef62e0c7f503e0d67692708.tar.gz
|
81a49d22188b587a92658adc7ad713852ff1460c SOURCES/glslang-sdk-1.3.283.0.tar.gz
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
diff -up ./CMakeLists.txt.dma ./CMakeLists.txt
|
diff -up glslang-sdk-1.3.275.0/CMakeLists.txt.dma glslang-sdk-1.3.275.0/CMakeLists.txt
|
||||||
--- ./CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
--- glslang-sdk-1.3.275.0/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
|
||||||
+++ ./CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
+++ glslang-sdk-1.3.275.0/CMakeLists.txt 2023-09-05 13:21:45.113297799 +1000
|
||||||
@@ -69,6 +69,13 @@ endmacro(glslang_pch)
|
@@ -106,6 +106,13 @@ endif()
|
||||||
|
|
||||||
project(glslang)
|
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,15 +12,31 @@ diff -up ./CMakeLists.txt.dma ./CMakeLists.txt
|
|||||||
+ 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()
|
||||||
@@ -166,11 +173,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA
|
@@ -264,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(NOT TARGET SPIRV-Tools-opt)
|
||||||
- set(ENABLE_OPT OFF)
|
- 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(ENABLE_OPT)
|
||||||
|
- message(WARNING "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.")
|
||||||
|
- endif()
|
||||||
|
- set(ENABLE_OPT OFF)
|
||||||
|
- 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()
|
-endif()
|
||||||
-
|
-
|
||||||
-if(ENABLE_OPT)
|
-if(ENABLE_OPT)
|
||||||
@ -28,45 +44,47 @@ diff -up ./CMakeLists.txt.dma ./CMakeLists.txt
|
|||||||
message(STATUS "optimizer enabled")
|
message(STATUS "optimizer enabled")
|
||||||
add_definitions(-DENABLE_OPT=1)
|
add_definitions(-DENABLE_OPT=1)
|
||||||
else()
|
else()
|
||||||
diff -up ./External/CMakeLists.txt.dma ./External/CMakeLists.txt
|
@@ -349,9 +336,6 @@ if (GLSLANG_ENABLE_INSTALL)
|
||||||
--- ./External/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in" [=[
|
||||||
+++ ./External/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
@PACKAGE_INIT@
|
||||||
@@ -35,10 +35,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/CMakeLists.txt.dma ./glslang/CMakeLists.txt
|
|
||||||
--- ./glslang/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
|
||||||
+++ ./glslang/CMakeLists.txt 2020-01-29 10:29:25.199187348 +1000
|
|
||||||
@@ -79,6 +79,7 @@ set(HEADERS
|
|
||||||
MachineIndependent/preprocessor/PpContext.h
|
|
||||||
MachineIndependent/preprocessor/PpTokens.h)
|
|
||||||
|
|
||||||
+set(VERSION 7.11.3113)
|
|
||||||
glslang_pch(SOURCES MachineIndependent/pch.cpp)
|
|
||||||
|
|
||||||
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
|
diff -up glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma glslang-sdk-1.3.275.0/glslang/CMakeLists.txt
|
||||||
@@ -115,7 +116,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
--- glslang-sdk-1.3.275.0/glslang/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
|
||||||
install(TARGETS glslang EXPORT glslangTargets
|
+++ glslang-sdk-1.3.275.0/glslang/CMakeLists.txt 2023-09-05 13:21:45.114297825 +1000
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
@@ -232,6 +232,8 @@ if(GLSLANG_ENABLE_INSTALL)
|
||||||
|
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)
|
||||||
|
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||||
endif()
|
endif()
|
||||||
- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
||||||
+ 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(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
|
||||||
endif(ENABLE_GLSLANG_INSTALL)
|
|
||||||
|
|
||||||
if(ENABLE_GLSLANG_INSTALL)
|
set(PUBLIC_HEADERS
|
||||||
diff -up ./glslang/glslang.pc.cmake.in.dma ./glslang/glslang.pc.cmake.in
|
|
||||||
--- ./glslang/glslang.pc.cmake.in.dma 2020-01-29 10:29:25.199187348 +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/glslang.pc.cmake.in 2020-01-29 10:29:25.199187348 +1000
|
--- 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@
|
||||||
@ -80,21 +98,21 @@ diff -up ./glslang/glslang.pc.cmake.in.dma ./glslang/glslang.pc.cmake.in
|
|||||||
+ 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 ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt
|
diff -up glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt
|
||||||
--- ./SPIRV/CMakeLists.txt.dma 2020-01-28 05:35:25.000000000 +1000
|
--- glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
|
||||||
+++ ./SPIRV/CMakeLists.txt 2020-01-29 10:29:25.200187375 +1000
|
+++ glslang-sdk-1.3.275.0/SPIRV/CMakeLists.txt 2023-09-05 13:21:45.116297879 +1000
|
||||||
@@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC
|
@@ -89,6 +89,10 @@ target_include_directories(SPIRV PUBLIC
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
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_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
|
set_target_properties(SPVRemapper PROPERTIES
|
||||||
@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
@@ -105,10 +109,17 @@ if(WIN32 AND BUILD_SHARED_LIBS)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -106,33 +124,28 @@ diff -up ./SPIRV/CMakeLists.txt.dma ./SPIRV/CMakeLists.txt
|
|||||||
+ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER})
|
+ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER})
|
||||||
+ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES})
|
+ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES})
|
||||||
+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 glslang 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 glslang)
|
target_link_libraries(SPIRV PRIVATE MachineIndependent)
|
||||||
endif(ENABLE_OPT)
|
endif()
|
||||||
@@ -97,6 +107,9 @@ if(ENABLE_GLSLANG_INSTALL)
|
@@ -125,5 +125,9 @@ if(GLSLANG_ENABLE_INSTALL)
|
||||||
|
|
||||||
install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
install(TARGETS SPIRV EXPORT glslang-targets)
|
||||||
|
|
||||||
+ # 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}/SPIRV/)
|
+
|
||||||
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
||||||
endif(ENABLE_GLSLANG_INSTALL)
|
endif()
|
||||||
diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in
|
diff -up glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in
|
||||||
--- ./SPIRV/spirv.pc.cmake.in.dma 2020-01-29 10:29:25.200187375 +1000
|
--- glslang-sdk-1.3.275.0/SPIRV/spirv.pc.cmake.in.dma 2023-09-05 13:21:45.116297879 +1000
|
||||||
+++ ./SPIRV/spirv.pc.cmake.in 2020-01-29 10:29:25.200187375 +1000
|
+++ glslang-sdk-1.3.275.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@
|
||||||
@ -146,45 +159,42 @@ diff -up ./SPIRV/spirv.pc.cmake.in.dma ./SPIRV/spirv.pc.cmake.in
|
|||||||
+ 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 ./SPIRV/SpvTools.cpp.dma ./SPIRV/SpvTools.cpp
|
diff -up glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp
|
||||||
--- ./SPIRV/SpvTools.cpp.dma 2020-01-28 05:35:25.000000000 +1000
|
--- glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp.dma 2023-08-09 04:49:36.000000000 +1000
|
||||||
+++ ./SPIRV/SpvTools.cpp 2020-01-29 10:29:25.200187375 +1000
|
+++ glslang-sdk-1.3.275.0/SPIRV/SpvTools.cpp 2023-09-05 13:21:45.117297906 +1000
|
||||||
@@ -43,8 +43,8 @@
|
@@ -43,7 +43,7 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "SpvTools.h"
|
#include "SpvTools.h"
|
||||||
-#include "spirv-tools/optimizer.hpp"
|
-#include "spirv-tools/optimizer.hpp"
|
||||||
-#include "spirv-tools/libspirv.h"
|
|
||||||
+#include <spirv-tools/optimizer.hpp>
|
+#include <spirv-tools/optimizer.hpp>
|
||||||
+#include <spirv-tools/libspirv.h>
|
|
||||||
|
|
||||||
namespace glslang {
|
namespace glslang {
|
||||||
|
|
||||||
diff -up ./StandAlone/CMakeLists.txt.dma ./StandAlone/CMakeLists.txt
|
diff -up glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt
|
||||||
--- ./StandAlone/CMakeLists.txt.dma 2020-01-29 10:29:09.052755158 +1000
|
--- glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt.dma 2023-08-09 04:49:36.000000000 +1000
|
||||||
+++ ./StandAlone/CMakeLists.txt 2020-01-29 10:29:25.201187402 +1000
|
+++ glslang-sdk-1.3.275.0/StandAlone/CMakeLists.txt 2023-09-05 13:22:23.806333232 +1000
|
||||||
@@ -23,6 +23,14 @@ if(ENABLE_SPVREMAPPER)
|
@@ -63,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(glslangValidator 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(glslangValidator 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)
|
||||||
@@ -32,9 +40,6 @@ elseif(UNIX)
|
@@ -72,8 +80,6 @@ elseif(UNIX)
|
||||||
endif(WIN32)
|
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_SPVREMAPPER)
|
if(ENABLE_SPVREMAPPER)
|
||||||
set(REMAPPER_SOURCES spirv-remap.cpp)
|
set(REMAPPER_SOURCES spirv-remap.cpp)
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
--- a/StandAlone/CMakeLists.txt
|
|
||||||
+++ b/StandAlone/CMakeLists.txt
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-add_library(glslang-default-resource-limits
|
|
||||||
+add_library(glslang-default-resource-limits STATIC
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
|
|
||||||
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
|
|
||||||
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
|
|
||||||
|
|
@ -1,25 +1,20 @@
|
|||||||
%global commit 07a55839eed550d84ef62e0c7f503e0d67692708
|
%global sdkver 1.3.283.0
|
||||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
|
||||||
%global commit_date 20200128
|
|
||||||
%global gitrel .%{commit_date}.git%{shortcommit}
|
|
||||||
|
|
||||||
Name: glslang
|
Name: glslang
|
||||||
Version: 8.13.3559
|
Version: 14.2.0
|
||||||
Release: 1%{?gitrel}%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: OpenGL and OpenGL ES shader front end and validator
|
Summary: OpenGL and OpenGL ES shader front end and validator
|
||||||
|
|
||||||
License: BSD and GPLv3+ and ASL 2.0
|
License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0
|
||||||
URL: https://github.com/KhronosGroup
|
URL: https://github.com/KhronosGroup/%{name}
|
||||||
Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
|
Source0: %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/%{name}-sdk-%{sdkver}.tar.gz
|
||||||
Patch1: glslang-default-resource-limits_staticlib.patch
|
# Patch to build against system spirv-tools (rebased locally)
|
||||||
# Patch to build against system spirv-tools
|
|
||||||
#Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
|
#Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
|
||||||
Patch3: 0001-pkg-config-compatibility.patch
|
Patch3: 0001-pkg-config-compatibility.patch
|
||||||
|
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: python3
|
|
||||||
BuildRequires: spirv-tools-devel
|
BuildRequires: spirv-tools-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -37,76 +32,140 @@ ES and OpenGL shading languages. It implements a strict
|
|||||||
interpretation of the specifications for these languages.
|
interpretation of the specifications for these languages.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-%{commit}
|
%autosetup -p1 -n %{name}-vulkan-sdk-%{sdkver}
|
||||||
# Fix rpmlint warning on debuginfo
|
# Fix rpmlint warning on debuginfo
|
||||||
find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
|
find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%__mkdir_p build
|
%cmake3 -DBUILD_SHARED_LIBS=OFF
|
||||||
pushd build
|
%cmake_build
|
||||||
%cmake3 -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
|
||||||
-DCMAKE_SKIP_RPATH:BOOL=yes \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
|
||||||
-GNinja ..
|
|
||||||
%{ninja_build}
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{ninja_install} -C build
|
%{cmake_install}
|
||||||
|
|
||||||
# we don't want them in here
|
# we don't want them in here
|
||||||
rm -rf %{buildroot}%{_includedir}/SPIRV
|
rm -rf %{buildroot}%{_includedir}/SPIRV
|
||||||
|
|
||||||
# Install libglslang-default-resource-limits.a
|
|
||||||
install -pm 0644 build/StandAlone/libglslang-default-resource-limits.a %{buildroot}%{_libdir}/
|
|
||||||
|
|
||||||
%ifnarch s390x ppc64
|
%ifnarch s390x ppc64
|
||||||
%check
|
%check
|
||||||
pushd Test
|
pushd Test
|
||||||
./runtests localResults ../build/StandAlone/glslangValidator ../build/StandAlone/spirv-remap
|
./runtests localResults ../%{_vpath_builddir}/StandAlone/glslangValidator ../%{_vpath_builddir}/StandAlone/spirv-remap
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.md README-spirv-remap.txt
|
%doc README.md README-spirv-remap.txt
|
||||||
|
%{_bindir}/glslang
|
||||||
%{_bindir}/glslangValidator
|
%{_bindir}/glslangValidator
|
||||||
%{_bindir}/spirv-remap
|
%{_bindir}/spirv-remap
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/glslang/
|
%{_includedir}/glslang/
|
||||||
%{_libdir}/libHLSL.a
|
|
||||||
%{_libdir}/libOGLCompiler.a
|
|
||||||
%{_libdir}/libOSDependent.a
|
%{_libdir}/libOSDependent.a
|
||||||
%{_libdir}/libSPIRV.a
|
%{_libdir}/libSPIRV.a
|
||||||
%{_libdir}/libSPVRemapper.a
|
%{_libdir}/libSPVRemapper.a
|
||||||
%{_libdir}/libglslang.a
|
%{_libdir}/libglslang.a
|
||||||
|
%{_libdir}/libGenericCodeGen.a
|
||||||
|
%{_libdir}/libMachineIndependent.a
|
||||||
%{_libdir}/libglslang-default-resource-limits.a
|
%{_libdir}/libglslang-default-resource-limits.a
|
||||||
%{_libdir}/pkgconfig/glslang.pc
|
%{_libdir}/pkgconfig/glslang.pc
|
||||||
%{_libdir}/pkgconfig/spirv.pc
|
%{_libdir}/pkgconfig/spirv.pc
|
||||||
%{_libdir}/cmake/*
|
%{_libdir}/cmake/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 30 2024 José Expósito <jexposit@redhat.com> - 14.2.0-3
|
||||||
|
- Fix license identifiers
|
||||||
|
|
||||||
|
* Thu May 30 2024 José Expósito <jexposit@redhat.com> - 14.2.0-2
|
||||||
|
- Update license identifiers
|
||||||
|
|
||||||
|
* Tue May 28 2024 José Expósito <jexposit@redhat.com> - 14.2.0-1
|
||||||
|
- Update to 1.3.283.0 SDK
|
||||||
|
|
||||||
|
* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 13.1.1-1
|
||||||
|
- Update to 1.3.268.0 SDK
|
||||||
|
|
||||||
|
* Fri Jul 07 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-5
|
||||||
|
- Latest snapshot used in 1.3.250.1 sdk
|
||||||
|
|
||||||
|
* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 11.9.0-4
|
||||||
|
- Latest snapshot used in 1.3.239 sdk
|
||||||
|
|
||||||
|
* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-3
|
||||||
|
- Latest snapshot used in 1.3.224 sdk
|
||||||
|
|
||||||
|
* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-2
|
||||||
|
- Latest snapshot used in 1.3.216 sdk
|
||||||
|
|
||||||
|
* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 11.9.0-1.20220202.git2742e95
|
||||||
|
- Latest snapshot used in 1.3.204 sdk
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.5.0-2.20210623.gitae2a562
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Jul 30 2021 Dave Airlie <airlied@redhat.com> - 11.5.0-1
|
||||||
|
- Latest snapshot used in 1.2.182 sdk
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 11.0.0-5.20201208.gitc594de2
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 11.0.0-4.20201208.gitc594de2
|
||||||
|
- Latest snapshot used in 1.2.162 sdk
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-3.20201104.gitd550beb
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 04 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-2
|
||||||
|
- Latest upstream snapshot
|
||||||
|
|
||||||
|
* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-1
|
||||||
|
- Latest upstream snapshot
|
||||||
|
|
||||||
|
* Tue Aug 04 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-5
|
||||||
|
- Use cmake macros.
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-4.2020421.gitc9b28b9
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.13.3559-3.2020421.gitc9b28b9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 22 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-2
|
||||||
|
- Update to latest git snapshot
|
||||||
|
|
||||||
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-1
|
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 8.13.3559-1
|
||||||
- Update glslang for 8.2.0 for vulkan 1.2
|
- Update to latest git snapshot
|
||||||
|
|
||||||
* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-2
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.13.3496-3.20191102.git7f77b2e
|
||||||
- Update for 8.2.0
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-1
|
* Thu Dec 19 2019 Leigh Scott <leigh123linux@googlemail.com> - 7.13.3496-2.20191102.git7f77b2e
|
||||||
- Update to latest snapshot
|
- Add patch for 'Fix a couple relative header paths in header'
|
||||||
|
|
||||||
* Thu Aug 15 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-4
|
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 7.13.3496-1
|
||||||
- Fix coverity scans (Kamil Dudka)
|
- Latest upstream snapshot for validation layers build
|
||||||
|
|
||||||
* Sat Aug 03 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-3
|
* Sat Aug 03 2019 Dave Airlie <airlied@redhat.com> - 7.11.3214-3
|
||||||
- Latest upstream snapshot for validation layers build
|
- Latest upstream snapshot for validation layers build
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.11.3214-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 10 01:27:27 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 7.11.3214-1
|
||||||
|
- Release 7.11.3214
|
||||||
- Add patch to build against system spirv-tools
|
- Add patch to build against system spirv-tools
|
||||||
|
|
||||||
* Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.11.20190329.gite0d59bb
|
* Fri Mar 29 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.13.20190329.gite0d59bb
|
||||||
- Update for vulkan 1.1.92.0
|
|
||||||
- Update for vulkan 1.1.101.0
|
- Update for vulkan 1.1.101.0
|
||||||
|
|
||||||
|
* Tue Feb 12 2019 Dave Airlie <airlied@redhat.com> - 3.1-0.12.20190212.git05d12a9
|
||||||
|
- Update for vulkan 1.1.92.0
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-0.11.20180727.gite99a268
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.10.20180727.gite99a268
|
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.10.20180727.gite99a268
|
||||||
- Update for vulkan 1.1.82.0
|
- Update for vulkan 1.1.82.0
|
||||||
|
|
||||||
@ -138,4 +197,3 @@ popd
|
|||||||
|
|
||||||
* Thu Jul 13 2017 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.1.20171028.git715c353
|
* Thu Jul 13 2017 Leigh Scott <leigh123linux@googlemail.com> - 3.1-0.1.20171028.git715c353
|
||||||
- First build
|
- First build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user