mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2317 from ShabbyX/glslang_angle

Browse Source 
gn: Optionally disable optimizations and HLSL
This commit is contained in:
John Kessenich 2020-07-04 08:40:19 -06:00 committed by GitHub
commit 909bca8ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 167 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
BUILD.gn
View File

@ -51,10 +51,13 @@ spirv_tools_dir = glslang_spirv_tools_dir
config("glslang_public") {
include_dirs = [ "." ]
if (!glslang_angle) {
defines = [ "ENABLE_HLSL=1" ]
}
}
source_set("glslang_sources") {
template("glslang_sources_common") {
source_set(target_name) {
public_configs = [ ":glslang_public" ]
sources = [
@ -88,21 +91,6 @@ source_set("glslang_sources") {
"SPIRV/spvIR.h",
"glslang/GenericCodeGen/CodeGen.cpp",
"glslang/GenericCodeGen/Link.cpp",
"glslang/HLSL/hlslAttributes.cpp",
"glslang/HLSL/hlslAttributes.h",
"glslang/HLSL/hlslGrammar.cpp",
"glslang/HLSL/hlslGrammar.h",
"glslang/HLSL/hlslOpMap.cpp",
"glslang/HLSL/hlslOpMap.h",
"glslang/HLSL/hlslParseables.cpp",
"glslang/HLSL/hlslParseables.h",
"glslang/HLSL/hlslParseHelper.cpp",
"glslang/HLSL/hlslParseHelper.h",
"glslang/HLSL/hlslScanContext.cpp",
"glslang/HLSL/hlslScanContext.h",
"glslang/HLSL/hlslTokens.h",
"glslang/HLSL/hlslTokenStream.cpp",
"glslang/HLSL/hlslTokenStream.h",
"glslang/Include/BaseTypes.h",
"glslang/Include/Common.h",
"glslang/Include/ConstantUnion.h",
@ -164,7 +152,30 @@ source_set("glslang_sources") {
"glslang/Public/ShaderLang.h",
]
defines = [ "ENABLE_OPT=1" ]
if (!glslang_angle) {
sources += [
"glslang/HLSL/hlslAttributes.cpp",
"glslang/HLSL/hlslAttributes.h",
"glslang/HLSL/hlslGrammar.cpp",
"glslang/HLSL/hlslGrammar.h",
"glslang/HLSL/hlslOpMap.cpp",
"glslang/HLSL/hlslOpMap.h",
"glslang/HLSL/hlslParseables.cpp",
"glslang/HLSL/hlslParseables.h",
"glslang/HLSL/hlslParseHelper.cpp",
"glslang/HLSL/hlslParseHelper.h",
"glslang/HLSL/hlslScanContext.cpp",
"glslang/HLSL/hlslScanContext.h",
"glslang/HLSL/hlslTokens.h",
"glslang/HLSL/hlslTokenStream.cpp",
"glslang/HLSL/hlslTokenStream.h",
]
}
defines = []
if (invoker.enable_opt) {
defines += [ "ENABLE_OPT=1" ]
}
if (is_win) {
sources += [ "glslang/OSDependent/Windows/ossource.cpp" ]
@ -193,23 +204,31 @@ source_set("glslang_sources") {
]
}
if (invoker.enable_opt) {
deps = [
"${spirv_tools_dir}:spvtools_opt",
"${spirv_tools_dir}:spvtools_val",
"${spirv_tools_dir}:spvtools_val"
]
}
configs -= _configs_to_remove
configs += _configs_to_add
}
}
glslang_sources_common("glslang_sources") {
enable_opt = !glslang_angle
}
glslang_sources_common("glslang_standalone_sources") {
enable_opt = true
}
source_set("glslang_default_resource_limits_sources") {
sources = [
"StandAlone/ResourceLimits.cpp",
"StandAlone/ResourceLimits.h",
]
deps = [
":glslang_sources",
]
public_configs = [ ":glslang_public" ]
configs -= _configs_to_remove
@ -227,7 +246,7 @@ executable("glslang_validator") {
defines = [ "ENABLE_OPT=1" ]
deps = [
":glslang_default_resource_limits_sources",
":glslang_sources",
":glslang_standalone_sources",
]
configs -= _configs_to_remove
@ -240,7 +259,7 @@ executable("spirv-remap") {
]
defines = [ "ENABLE_OPT=1" ]
deps = [
":glslang_sources",
":glslang_standalone_sources",
]
configs -= _configs_to_remove