Latest upstream snapshot
This commit is contained in:
parent
5642ca3abe
commit
c3da894170
@ -1,6 +1,6 @@
|
|||||||
diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt.dma 2020-08-03 17:28:52.000000000 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt 2020-08-05 10:39:28.284711476 +1000
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000
|
||||||
@@ -118,6 +118,13 @@ if(USE_CCACHE)
|
@@ -118,6 +118,13 @@ if(USE_CCACHE)
|
||||||
endif(CCACHE_FOUND)
|
endif(CCACHE_FOUND)
|
||||||
endif()
|
endif()
|
||||||
@ -15,7 +15,7 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt.dma gls
|
|||||||
if(ENABLE_CTEST)
|
if(ENABLE_CTEST)
|
||||||
include(CTest)
|
include(CTest)
|
||||||
endif()
|
endif()
|
||||||
@@ -312,11 +319,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-5743eed4d16757402517a1068137f4bc1645ee87/CMakeLists.txt.dma gls
|
|||||||
message(STATUS "optimizer enabled")
|
message(STATUS "optimizer enabled")
|
||||||
add_definitions(-DENABLE_OPT=1)
|
add_definitions(-DENABLE_OPT=1)
|
||||||
else()
|
else()
|
||||||
diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/External/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/External/CMakeLists.txt
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/External/CMakeLists.txt.dma 2020-08-03 17:28:52.000000000 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/External/CMakeLists.txt 2020-08-05 10:39:28.284711476 +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,9 +42,9 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/External/CMakeLists.tx
|
|||||||
- endif()
|
- endif()
|
||||||
-endif()
|
-endif()
|
||||||
-
|
-
|
||||||
diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/CMakeLists.txt
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/CMakeLists.txt.dma 2020-08-05 10:39:28.285711502 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/CMakeLists.txt 2020-08-05 10:40:17.199007448 +1000
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000
|
||||||
@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL)
|
||||||
EXPORT glslangTargets
|
EXPORT glslangTargets
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
@ -54,9 +54,9 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/CMakeLists.txt
|
|||||||
|
|
||||||
install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
|
||||||
|
|
||||||
diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/glslang.pc.cmake.in.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/glslang.pc.cmake.in
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/glslang.pc.cmake.in.dma 2020-08-05 10:39:28.286711529 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma 2020-11-04 06:32:09.031326265 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/glslang.pc.cmake.in 2020-08-05 10:39:28.286711529 +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,9 +70,9 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/glslang/glslang.pc.cma
|
|||||||
+ 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-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/CMakeLists.txt
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/CMakeLists.txt.dma 2020-08-03 17:28:52.000000000 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/CMakeLists.txt 2020-08-05 10:41:36.596111056 +1000
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000
|
||||||
@@ -77,6 +77,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)
|
||||||
@ -120,9 +120,9 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/CMakeLists.txt.d
|
|||||||
|
|
||||||
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
|
||||||
endif(ENABLE_GLSLANG_INSTALL)
|
endif(ENABLE_GLSLANG_INSTALL)
|
||||||
diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/spirv.pc.cmake.in.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/spirv.pc.cmake.in
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/spirv.pc.cmake.in.dma 2020-08-05 10:39:29.766750741 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma 2020-11-04 06:32:09.032326292 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/spirv.pc.cmake.in 2020-08-05 10:39:29.766750741 +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@
|
||||||
@ -136,24 +136,22 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/spirv.pc.cmake.i
|
|||||||
+ 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-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/SpvTools.cpp.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/SpvTools.cpp
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/SpvTools.cpp.dma 2020-08-03 17:28:52.000000000 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma 2020-11-04 06:32:09.032326292 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/SPIRV/SpvTools.cpp 2020-08-05 10:39:29.767750768 +1000
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp 2020-11-04 06:33:06.481878394 +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 glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt
|
diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt
|
||||||
--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma 2020-08-05 10:39:20.063493655 +1000
|
--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma 2020-11-04 06:31:49.139788864 +1000
|
||||||
+++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt 2020-08-05 10:39:29.767750768 +1000
|
+++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt 2020-11-04 06:32:09.032326292 +1000
|
||||||
@@ -57,6 +57,14 @@ if(ENABLE_SPVREMAPPER)
|
@@ -56,6 +56,14 @@ if(ENABLE_SPVREMAPPER)
|
||||||
set(LIBRARIES ${LIBRARIES} SPVRemapper)
|
set(LIBRARIES ${LIBRARIES} SPVRemapper)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -168,7 +166,7 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.
|
|||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(LIBRARIES ${LIBRARIES} psapi)
|
set(LIBRARIES ${LIBRARIES} psapi)
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
@@ -66,9 +74,6 @@ elseif(UNIX)
|
@@ -65,9 +73,6 @@ elseif(UNIX)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
target_link_libraries(glslangValidator ${LIBRARIES})
|
target_link_libraries(glslangValidator ${LIBRARIES})
|
||||||
@ -176,5 +174,5 @@ diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.
|
|||||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
|
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
|
||||||
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
|
||||||
|
|
||||||
if(ENABLE_SPVREMAPPER)
|
if(ENABLE_OPT)
|
||||||
set(REMAPPER_SOURCES spirv-remap.cpp)
|
target_include_directories(glslangValidator
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
%global commit 5743eed4d16757402517a1068137f4bc1645ee87
|
%global commit d550bebee919179c9e332a0ab28a67f8fe3ca239
|
||||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||||
%global commit_date 20200803
|
%global commit_date 20201104
|
||||||
%global gitrel .%{commit_date}.git%{shortcommit}
|
%global gitrel .%{commit_date}.git%{shortcommit}
|
||||||
|
|
||||||
Name: glslang
|
Name: glslang
|
||||||
Version: 11.0.0
|
Version: 11.0.0
|
||||||
Release: 1%{?gitrel}%{?dist}
|
Release: 2%{?gitrel}%{?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 and GPLv3+ and ASL 2.0
|
||||||
@ -81,6 +81,9 @@ install -pm 0644 %{_vpath_builddir}/StandAlone/libglslang-default-resource-limit
|
|||||||
%{_libdir}/cmake/*
|
%{_libdir}/cmake/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 11.0.0-1
|
||||||
- Latest upstream snapshot
|
- Latest upstream snapshot
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user