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

Merge pull request #1882 from Kangz/fix-chrome

Browse Source 
GN build (for Chromium): enable HLSL in dependents.
This commit is contained in:
John Kessenich 2019-08-26 07:47:30 -06:00 committed by GitHub
commit 32d18c552b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BUILD.gn
View File

@ -37,6 +37,8 @@ spirv_tools_dir = glslang_spirv_tools_dir
config("glslang_public") { config("glslang_public") {
include_dirs = [ "." ] include_dirs = [ "." ]
defines = [ "ENABLE_HLSL=1" ]
} }
source_set("glslang_sources") { source_set("glslang_sources") {
@ -131,10 +133,7 @@ source_set("glslang_sources") {
"glslang/Public/ShaderLang.h", "glslang/Public/ShaderLang.h",
] ]
defines = [ defines = [ "ENABLE_OPT=1" ]
"ENABLE_OPT=1",
"ENABLE_HLSL=1",
]
if (is_win) { if (is_win) {
sources += [ "glslang/OSDependent/Windows/ossource.cpp" ] sources += [ "glslang/OSDependent/Windows/ossource.cpp" ]
@ -157,8 +156,8 @@ source_set("glslang_sources") {
} }
if (is_win && !is_clang) { if (is_win && !is_clang) {
cflags = [ cflags = [
"/wd4018", # signed/unsigned mismatch "/wd4018", # signed/unsigned mismatch
"/wd4189", # local variable is initialized but not referenced "/wd4189", # local variable is initialized but not referenced
] ]
} }
@ -173,7 +172,9 @@ source_set("glslang_default_resource_limits_sources") {
"StandAlone/ResourceLimits.cpp", "StandAlone/ResourceLimits.cpp",
"StandAlone/ResourceLimits.h", "StandAlone/ResourceLimits.h",
] ]
deps = [ ":glslang_sources" ] deps = [
":glslang_sources",
]
public_configs = [ ":glslang_public" ] public_configs = [ ":glslang_public" ]
} }