Update dxc to reduce its binary size

Related work item: Github #19
This commit is contained in:
Minmin Gong 2019-05-30 20:48:18 +08:00
Родитель 73b4941aaf
Коммит f302367332
3 изменённых файлов: 15 добавлений и 13 удалений

Просмотреть файл

@ -35,6 +35,8 @@ if((CMAKE_C_COMPILER_ID MATCHES GNU) OR (CMAKE_C_COMPILER_ID MATCHES Clang))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
endif() endif()
set(Python_ADDITIONAL_VERSIONS 3.5 3.6 3.7)
# DirectXShaderCompiler requires it # DirectXShaderCompiler requires it
add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_ITERATOR_DEBUG_LEVEL=0)
# Handle a compiling issue of SPIR-V # Handle a compiling issue of SPIR-V

12
External/CMakeLists.txt поставляемый
Просмотреть файл

@ -8,10 +8,10 @@ endif()
set(cxxopts_REV "3f2d70530219e09fe7e563f86126b0d3b228a60d") set(cxxopts_REV "3f2d70530219e09fe7e563f86126b0d3b228a60d")
set(googletest_REV "440527a61e1c91188195f7de212c63c77e8f0a45") set(googletest_REV "440527a61e1c91188195f7de212c63c77e8f0a45")
set(SPIRV_Headers_REV "111a25e4ae45e2b4d7c18415e1d6884712b958c4") set(SPIRV_Headers_REV "4b0985f29277a81f5ce88feb0502cc44d6d5e7c3")
set(SPIRV_Tools_REV "12e4a7b649e6fe28683de9fc352200c82948a1f0") set(SPIRV_Tools_REV "e935dac9ef8a01fdb6d0a4b7898563e6f62d1081")
set(DirectXShaderCompiler_REV "850c8d36761b2c45ac752b3747c37940db9c64f9") set(DirectXShaderCompiler_REV "2dec1cd0df488988f27c5ce790d9025efe582908")
set(SPIRV_Cross_REV "942273dc7b107d4f0c2cf3449ae306525e1cbae7") set(SPIRV_Cross_REV "cb686a5dba9a7086a778fe21900383beed9ea5d3")
function(UpdateExternalLib name url rev) function(UpdateExternalLib name url rev)
set(need_checkout FALSE) set(need_checkout FALSE)
@ -64,9 +64,9 @@ set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "" FORCE)
set(SPIRV_TOOLS_EXTRA_DEFINITIONS /D_ITERATOR_DEBUG_LEVEL=0) set(SPIRV_TOOLS_EXTRA_DEFINITIONS /D_ITERATOR_DEBUG_LEVEL=0)
add_subdirectory(SPIRV-Tools EXCLUDE_FROM_ALL) add_subdirectory(SPIRV-Tools EXCLUDE_FROM_ALL)
foreach(target foreach(target
"core_tables" "enum_string_mapping" "extinst_tables"
"spirv-tools-pkg-config" "spirv-tools-shared-pkg-config" "spirv-tools-pkg-config" "spirv-tools-shared-pkg-config"
"spirv-tools-build-version" "spirv-tools-debuginfo" "spirv-tools-header-DebugInfo" "spirv-tools-spv-amd-gcn-shader" "spirv-tools-build-version" "spirv-tools-header-DebugInfo"
"spirv-tools-spv-amd-shader-ballot" "spirv-tools-spv-amd-shader-explicit-vertex-parameter" "spirv-tools-spv-amd-shader-trinary-minmax"
"SPIRV-Tools-link" "SPIRV-Tools-shared" "SPIRV-Tools-link" "SPIRV-Tools-shared"
"spirv-tools-vimsyntax") "spirv-tools-vimsyntax")
get_target_property(vsFolder ${target} FOLDER) get_target_property(vsFolder ${target} FOLDER)

Просмотреть файл

@ -15,7 +15,7 @@ jobs:
compiler: vc140 compiler: vc140
combination: 'win-$(compiler)-$(platform)-$(configuration)' combination: 'win-$(compiler)-$(platform)-$(configuration)'
buildFolder: 'Build/ninja-$(combination)' buildFolder: 'Build/ninja-$(combination)'
installCommand: 'choco install ninja' installCommand: 'choco install ninja python3'
testCommand: './$(buildFolder)/Bin/ShaderConductorTest.exe' testCommand: './$(buildFolder)/Bin/ShaderConductorTest.exe'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductor.dll Bin/ShaderConductor.dll
@ -34,7 +34,7 @@ jobs:
compiler: vc141 compiler: vc141
combination: 'win-$(compiler)-$(platform)-$(configuration)' combination: 'win-$(compiler)-$(platform)-$(configuration)'
buildFolder: 'Build/ninja-$(combination)' buildFolder: 'Build/ninja-$(combination)'
installCommand: 'choco install ninja' installCommand: 'choco install ninja python3'
testCommand: './$(buildFolder)/Bin/ShaderConductorTest.exe' testCommand: './$(buildFolder)/Bin/ShaderConductorTest.exe'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductor.dll Bin/ShaderConductor.dll
@ -56,7 +56,7 @@ jobs:
installCommand: | installCommand: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install g++-7 ninja-build sudo apt-get install g++-7 ninja-build python3
testCommand: './$(buildFolder)/Bin/ShaderConductorTest' testCommand: './$(buildFolder)/Bin/ShaderConductorTest'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductorCmd Bin/ShaderConductorCmd
@ -79,7 +79,7 @@ jobs:
installCommand: | installCommand: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install g++-8 ninja-build sudo apt-get install g++-8 ninja-build python3
testCommand: './$(buildFolder)/Bin/ShaderConductorTest' testCommand: './$(buildFolder)/Bin/ShaderConductorTest'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductorCmd Bin/ShaderConductorCmd
@ -103,7 +103,7 @@ jobs:
sudo add-apt-repository ppa:llvm-toolchain-xenial-6.0/main sudo add-apt-repository ppa:llvm-toolchain-xenial-6.0/main
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install clang-6.0 libstdc++-6-dev lld-6.0 ninja-build sudo apt-get install clang-6.0 libstdc++-6-dev lld-6.0 ninja-build python3
testCommand: './$(buildFolder)/Bin/ShaderConductorTest' testCommand: './$(buildFolder)/Bin/ShaderConductorTest'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductorCmd Bin/ShaderConductorCmd
@ -128,7 +128,7 @@ jobs:
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install clang-7 libstdc++-7-dev lld-7 ninja-build sudo apt-get install clang-7 libstdc++-7-dev lld-7 ninja-build python3
testCommand: './$(buildFolder)/Bin/ShaderConductorTest' testCommand: './$(buildFolder)/Bin/ShaderConductorTest'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductorCmd Bin/ShaderConductorCmd
@ -150,7 +150,7 @@ jobs:
buildFolder: 'Build/ninja-$(combination)' buildFolder: 'Build/ninja-$(combination)'
installCommand: | installCommand: |
brew update brew update
brew install ninja brew install ninja python3
testCommand: './$(buildFolder)/Bin/ShaderConductorTest' testCommand: './$(buildFolder)/Bin/ShaderConductorTest'
artifactBinaries: | artifactBinaries: |
Bin/ShaderConductorCmd Bin/ShaderConductorCmd