AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-15 14:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
f0089e5499
glslang/BUILD.gn

249 lines
8.1 KiB
Plaintext
Raw Normal View History

Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
# Copyright (C) 2018 Google, Inc.
#
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import("//build_overrides/glslang.gni")
BUILD.gn: Fix fuchsia build (#1944) The Fuchsia platform build and the Chromium one use a completely different set of configs to specify default warnings. The previous version of BUILD.gn worked with Chromium, but failed to build with Fuchsia. This CL fixes the issue by identifying said configs and reusing them consistently. Change-Id: I7de526a57d2f14eb93c03e06401d2c3059d35e9a
2019-10-23 14:07:19 +00:00
# Both Chromium and Fuchsia use by default a set of warning errors
# that is far too strict to compile this project. These are also
# typically appended after |cflags|, overriding target-specific
# definitions. To work around this, determine which configs to
# add and remove in order to succesfully build the project.
if (defined(is_fuchsia_tree) && is_fuchsia_tree) {
_configs_to_remove = [ "//build/config:default_warnings" ]
_configs_to_add = []
} else {
_configs_to_remove = [ "//build/config/compiler:chromium_code" ]
_configs_to_add = [ "//build/config/compiler:no_chromium_code" ]
}
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
spirv_tools_dir = glslang_spirv_tools_dir
config("glslang_public") {
include_dirs = [ "." ]
GN build (for Chromium): enable HLSL in dependents. The previous fix for this only enabled HLSL internally in glslang which means that dependent using HLSL, for example shaderc, failed compilation.
2019-08-26 12:13:54 +00:00
defines = [ "ENABLE_HLSL=1" ]
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
}
Review feedback
2018-09-24 22:40:38 +00:00
source_set("glslang_sources") {
BUILD.gn: glslang_sources need the public config too
2018-10-03 17:15:23 +00:00
public_configs = [ ":glslang_public" ]
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
sources = [
"OGLCompilersDLL/InitializeDll.cpp",
"OGLCompilersDLL/InitializeDll.h",
Add a couple missing headers to the GN build. Detected with ANGLE's export_targets script.
2019-11-02 13:56:09 +00:00
"SPIRV/GLSL.ext.AMD.h",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"SPIRV/GLSL.ext.EXT.h",
"SPIRV/GLSL.ext.KHR.h",
Add a couple missing headers to the GN build. Detected with ANGLE's export_targets script.
2019-11-02 13:56:09 +00:00
"SPIRV/GLSL.ext.NV.h",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"SPIRV/GLSL.std.450.h",
"SPIRV/GlslangToSpv.cpp",
"SPIRV/GlslangToSpv.h",
"SPIRV/InReadableOrder.cpp",
"SPIRV/Logger.cpp",
"SPIRV/Logger.h",
GL_EXT_debug_printf implementation
2019-05-31 18:06:01 +00:00
"SPIRV/NonSemanticDebugPrintf.h",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"SPIRV/SPVRemapper.cpp",
"SPIRV/SPVRemapper.h",
"SPIRV/SpvBuilder.cpp",
"SPIRV/SpvBuilder.h",
BUILD.gn: make the static_lib complete to fix the build on OSX
2018-09-26 21:51:19 +00:00
"SPIRV/SpvPostProcess.cpp",
Build.gn: allow optimization in glslang lib and standalone
2019-05-17 03:53:15 +00:00
"SPIRV/SpvTools.cpp",
"SPIRV/SpvTools.h",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"SPIRV/bitutils.h",
"SPIRV/disassemble.cpp",
"SPIRV/disassemble.h",
"SPIRV/doc.cpp",
"SPIRV/doc.h",
"SPIRV/hex_float.h",
"SPIRV/spirv.hpp",
"SPIRV/spvIR.h",
"glslang/GenericCodeGen/CodeGen.cpp",
"glslang/GenericCodeGen/Link.cpp",
"glslang/Include/BaseTypes.h",
"glslang/Include/Common.h",
"glslang/Include/ConstantUnion.h",
"glslang/Include/InfoSink.h",
"glslang/Include/InitializeGlobals.h",
"glslang/Include/PoolAlloc.h",
"glslang/Include/ResourceLimits.h",
"glslang/Include/ShHandle.h",
"glslang/Include/Types.h",
"glslang/Include/arrays.h",
"glslang/Include/intermediate.h",
"glslang/Include/revision.h",
"glslang/MachineIndependent/Constant.cpp",
"glslang/MachineIndependent/InfoSink.cpp",
"glslang/MachineIndependent/Initialize.cpp",
"glslang/MachineIndependent/Initialize.h",
"glslang/MachineIndependent/IntermTraverse.cpp",
"glslang/MachineIndependent/Intermediate.cpp",
"glslang/MachineIndependent/LiveTraverser.h",
"glslang/MachineIndependent/ParseContextBase.cpp",
"glslang/MachineIndependent/ParseHelper.cpp",
"glslang/MachineIndependent/ParseHelper.h",
"glslang/MachineIndependent/PoolAlloc.cpp",
"glslang/MachineIndependent/RemoveTree.cpp",
"glslang/MachineIndependent/RemoveTree.h",
"glslang/MachineIndependent/Scan.cpp",
"glslang/MachineIndependent/Scan.h",
"glslang/MachineIndependent/ScanContext.h",
"glslang/MachineIndependent/ShaderLang.cpp",
"glslang/MachineIndependent/SymbolTable.cpp",
"glslang/MachineIndependent/SymbolTable.h",
"glslang/MachineIndependent/Versions.cpp",
"glslang/MachineIndependent/Versions.h",
"glslang/MachineIndependent/attribute.cpp",
"glslang/MachineIndependent/attribute.h",
"glslang/MachineIndependent/gl_types.h",
"glslang/MachineIndependent/glslang_tab.cpp",
"glslang/MachineIndependent/glslang_tab.cpp.h",
"glslang/MachineIndependent/intermOut.cpp",
"glslang/MachineIndependent/iomapper.cpp",
"glslang/MachineIndependent/iomapper.h",
"glslang/MachineIndependent/limits.cpp",
"glslang/MachineIndependent/linkValidate.cpp",
"glslang/MachineIndependent/localintermediate.h",
"glslang/MachineIndependent/parseConst.cpp",
"glslang/MachineIndependent/parseVersions.h",
"glslang/MachineIndependent/preprocessor/Pp.cpp",
"glslang/MachineIndependent/preprocessor/PpAtom.cpp",
"glslang/MachineIndependent/preprocessor/PpContext.cpp",
"glslang/MachineIndependent/preprocessor/PpContext.h",
"glslang/MachineIndependent/preprocessor/PpScanner.cpp",
"glslang/MachineIndependent/preprocessor/PpTokens.cpp",
"glslang/MachineIndependent/preprocessor/PpTokens.h",
"glslang/MachineIndependent/propagateNoContraction.cpp",
"glslang/MachineIndependent/propagateNoContraction.h",
"glslang/MachineIndependent/reflection.cpp",
"glslang/MachineIndependent/reflection.h",
"glslang/OSDependent/osinclude.h",
"glslang/Public/ShaderLang.h",
BUILD.gn: Add missing HLSL files.
2019-08-27 13:24:31 +00:00
"hlsl/hlslAttributes.cpp",
"hlsl/hlslAttributes.h",
"hlsl/hlslGrammar.cpp",
"hlsl/hlslGrammar.h",
"hlsl/hlslOpMap.cpp",
"hlsl/hlslOpMap.h",
"hlsl/hlslParseHelper.cpp",
"hlsl/hlslParseHelper.h",
"hlsl/hlslParseables.cpp",
"hlsl/hlslParseables.h",
"hlsl/hlslScanContext.cpp",
"hlsl/hlslScanContext.h",
"hlsl/hlslTokenStream.cpp",
"hlsl/hlslTokenStream.h",
"hlsl/hlslTokens.h",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
]
GN build (for Chromium): enable HLSL in dependents. The previous fix for this only enabled HLSL internally in glslang which means that dependent using HLSL, for example shaderc, failed compilation.
2019-08-26 12:13:54 +00:00
defines = [ "ENABLE_OPT=1" ]
GN build (for Chromium): enable HLSL
2019-08-23 18:34:29 +00:00
Review feedback
2018-09-24 22:40:38 +00:00
if (is_win) {
sources += [ "glslang/OSDependent/Windows/ossource.cpp" ]
defines += [ "GLSLANG_OSINCLUDE_WIN32" ]
} else {
sources += [ "glslang/OSDependent/Unix/ossource.cpp" ]
defines += [ "GLSLANG_OSINCLUDE_UNIX" ]
}
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
if (is_clang) {
Fix config issues and revert previous fixes for semi-colon issues This reverts commit 41261d95a417bb3a121c162154d441433705a237. This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218. Instead of trying to work around all of the potential semicolon issues in glslang, making it conform to Chromium's style, mark the code explicitly as non-chromium in the BUILD.gn, so chromium doesn't attempt to enforce its style rules on glslang. Fixes #1931
2019-10-15 15:17:53 +00:00
cflags = [
Disable Clang extra semicolon warning. Usually this warning is disabled by default. But when turned on Clang complains about extra semicolons in Glslang headers. Turn this off for now. See http://crbug.com/926235
2019-01-30 16:37:15 +00:00
"-Wno-extra-semi",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"-Wno-ignored-qualifiers",
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
"-Wno-implicit-fallthrough",
Suppress inconsistent override warning in GN. This came up when trying to roll the new glslang into Chromium. ANGLE bug: 3088
2019-01-23 23:56:43 +00:00
"-Wno-inconsistent-missing-override",
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
"-Wno-sign-compare",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
"-Wno-unused-variable",
BUILD.gn: Fix file for use with Fuchsia platform build. In order to upgrade the version of glslang used by the Fuchsia platform source tree, BUILD.gn needs to be slightly modified to care about the case where it is not used with the Chromium //build configuration: - Remove a new compiler warning to ensure proper compilation with -Werror (which is the default). - Add a build target for spirv-remap, which is used by Fuchsia at build time to optimize the precompiled shaders of some of its graphics libraries.
2019-06-21 12:58:30 +00:00
"-Wno-missing-field-initializers",
Fix Fuchsia build. The Fuchsia build is very picky about newlines at the end of files and will complain loudly about them. Removing the -Wnewline-eof warning solves the issue.
2019-09-16 17:13:16 +00:00
"-Wno-newline-eof",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
]
}
Suppress a MSVC cast warning in GN. Also came up when using the BUILD.gn file with ANGLE. ANGLE bug: 3088
2019-01-24 15:55:41 +00:00
if (is_win && !is_clang) {
cflags = [
GN build (for Chromium): enable HLSL in dependents. The previous fix for this only enabled HLSL internally in glslang which means that dependent using HLSL, for example shaderc, failed compilation.
2019-08-26 12:13:54 +00:00
"/wd4018", # signed/unsigned mismatch
"/wd4189", # local variable is initialized but not referenced
Suppress a MSVC cast warning in GN. Also came up when using the BUILD.gn file with ANGLE. ANGLE bug: 3088
2019-01-24 15:55:41 +00:00
]
}
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
deps = [
"${spirv_tools_dir}:spvtools_opt",
Build.gn: allow optimization in glslang lib and standalone
2019-05-17 03:53:15 +00:00
"${spirv_tools_dir}:spvtools_val",
Add BUILD.gn configuration. This CL adds the necessary configuration to build glslang inside a Chromium checkout. Two build warnings were fixed in the process to make things compile.
2018-09-24 20:35:44 +00:00
]
Fix config issues and revert previous fixes for semi-colon issues This reverts commit 41261d95a417bb3a121c162154d441433705a237. This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218. Instead of trying to work around all of the potential semicolon issues in glslang, making it conform to Chromium's style, mark the code explicitly as non-chromium in the BUILD.gn, so chromium doesn't attempt to enforce its style rules on glslang. Fixes #1931
2019-10-15 15:17:53 +00:00
BUILD.gn: Fix fuchsia build (#1944) The Fuchsia platform build and the Chromium one use a completely different set of configs to specify default warnings. The previous version of BUILD.gn worked with Chromium, but failed to build with Fuchsia. This CL fixes the issue by identifying said configs and reusing them consistently. Change-Id: I7de526a57d2f14eb93c03e06401d2c3059d35e9a
2019-10-23 14:07:19 +00:00
configs -= _configs_to_remove
configs += _configs_to_add
Review feedback
2018-09-24 22:40:38 +00:00
}
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
source_set("glslang_default_resource_limits_sources") {
sources = [
"StandAlone/ResourceLimits.cpp",
"StandAlone/ResourceLimits.h",
]
GN build (for Chromium): enable HLSL in dependents. The previous fix for this only enabled HLSL internally in glslang which means that dependent using HLSL, for example shaderc, failed compilation.
2019-08-26 12:13:54 +00:00
deps = [
":glslang_sources",
]
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
public_configs = [ ":glslang_public" ]
Fix config issues and revert previous fixes for semi-colon issues This reverts commit 41261d95a417bb3a121c162154d441433705a237. This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218. Instead of trying to work around all of the potential semicolon issues in glslang, making it conform to Chromium's style, mark the code explicitly as non-chromium in the BUILD.gn, so chromium doesn't attempt to enforce its style rules on glslang. Fixes #1931
2019-10-15 15:17:53 +00:00
BUILD.gn: Fix fuchsia build (#1944) The Fuchsia platform build and the Chromium one use a completely different set of configs to specify default warnings. The previous version of BUILD.gn worked with Chromium, but failed to build with Fuchsia. This CL fixes the issue by identifying said configs and reusing them consistently. Change-Id: I7de526a57d2f14eb93c03e06401d2c3059d35e9a
2019-10-23 14:07:19 +00:00
configs -= _configs_to_remove
configs += _configs_to_add
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
}
GN: Make glslang_validator an executable. The target was accidentally listed as a source_set.
2019-03-11 19:45:31 +00:00
executable("glslang_validator") {
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
sources = [
"StandAlone/DirStackFileIncluder.h",
"StandAlone/StandAlone.cpp",
]
if (!is_win) {
cflags = [ "-Woverflow" ]
}
Build.gn: allow optimization in glslang lib and standalone
2019-05-17 03:53:15 +00:00
defines = [ "ENABLE_OPT=1" ]
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
deps = [
":glslang_default_resource_limits_sources",
":glslang_sources",
]
Fix config issues and revert previous fixes for semi-colon issues This reverts commit 41261d95a417bb3a121c162154d441433705a237. This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218. Instead of trying to work around all of the potential semicolon issues in glslang, making it conform to Chromium's style, mark the code explicitly as non-chromium in the BUILD.gn, so chromium doesn't attempt to enforce its style rules on glslang. Fixes #1931
2019-10-15 15:17:53 +00:00
BUILD.gn: Fix fuchsia build (#1944) The Fuchsia platform build and the Chromium one use a completely different set of configs to specify default warnings. The previous version of BUILD.gn worked with Chromium, but failed to build with Fuchsia. This CL fixes the issue by identifying said configs and reusing them consistently. Change-Id: I7de526a57d2f14eb93c03e06401d2c3059d35e9a
2019-10-23 14:07:19 +00:00
configs -= _configs_to_remove
configs += _configs_to_add
Fix a few GN build issues. * adds a source set for default resource limits to mirror CMake * adds a target executable for the standalone validator * fixes a missing warning Allows ANGLE to use the integrated BUILD.gn instead of a custom one. ANGLE bug: 3088
2019-01-18 19:53:31 +00:00
}
BUILD.gn: Fix file for use with Fuchsia platform build. In order to upgrade the version of glslang used by the Fuchsia platform source tree, BUILD.gn needs to be slightly modified to care about the case where it is not used with the Chromium //build configuration: - Remove a new compiler warning to ensure proper compilation with -Werror (which is the default). - Add a build target for spirv-remap, which is used by Fuchsia at build time to optimize the precompiled shaders of some of its graphics libraries.
2019-06-21 12:58:30 +00:00
executable("spirv-remap") {
sources = [
"StandAlone/spirv-remap.cpp",
]
defines = [ "ENABLE_OPT=1" ]
deps = [
":glslang_sources",
]
Fix config issues and revert previous fixes for semi-colon issues This reverts commit 41261d95a417bb3a121c162154d441433705a237. This reverts commit 7c9accb6534d4cde050555b8091b434dc7e4d218. Instead of trying to work around all of the potential semicolon issues in glslang, making it conform to Chromium's style, mark the code explicitly as non-chromium in the BUILD.gn, so chromium doesn't attempt to enforce its style rules on glslang. Fixes #1931
2019-10-15 15:17:53 +00:00
BUILD.gn: Fix fuchsia build (#1944) The Fuchsia platform build and the Chromium one use a completely different set of configs to specify default warnings. The previous version of BUILD.gn worked with Chromium, but failed to build with Fuchsia. This CL fixes the issue by identifying said configs and reusing them consistently. Change-Id: I7de526a57d2f14eb93c03e06401d2c3059d35e9a
2019-10-23 14:07:19 +00:00
configs -= _configs_to_remove
configs += _configs_to_add
BUILD.gn: Fix file for use with Fuchsia platform build. In order to upgrade the version of glslang used by the Fuchsia platform source tree, BUILD.gn needs to be slightly modified to care about the case where it is not used with the Chromium //build configuration: - Remove a new compiler warning to ensure proper compilation with -Werror (which is the default). - Add a build target for spirv-remap, which is used by Fuchsia at build time to optimize the precompiled shaders of some of its graphics libraries.
2019-06-21 12:58:30 +00:00
}
Reference in New Issue Copy Permalink