Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b291ad0

Browse files
ShabbyXCommit Bot
authored and
Commit Bot
committed
Build specialized version of glslang
Bug: angleproject:4763 Change-Id: Ibb98c872a1283b9d6acde958a7c5212cf79e72df Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2281618 Reviewed-by: Jamie Madill <[email protected]> Reviewed-by: Tobin Ehlis <[email protected]> Commit-Queue: Shahbaz Youssefi <[email protected]>
1 parent 36a97db commit b291ad0

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ if (angle_enable_vulkan || angle_enable_metal) {
578578
deps = [
579579
":libANGLE_headers",
580580
"${angle_glslang_dir}:glslang_default_resource_limits_sources",
581-
"${angle_glslang_dir}:glslang_sources",
581+
"${angle_glslang_dir}:glslang_lib_sources",
582582
"${angle_spirv_headers_dir}:spv_headers",
583583
"${angle_spirv_tools_dir}:spvtools_headers",
584584
]

build_overrides/glslang.gni

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
# Paths to glslang dependencies in ANGLE
66
glslang_spirv_tools_dir = "//third_party/spirv-tools/src"
77

8-
# Temporary to unblock glslang roll. Will change to true afterwards.
9-
glslang_angle = false
8+
# Reduce glslang's features to what the Vulkan backend of ANGLE uses. This both speeds up glslang's
9+
# initialization and reduces binary footprint.
10+
glslang_angle = true

scripts/export_targets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ def pre(k):
218218
}
219219

220220
IGNORED_DIRECTORIES = {
221+
'//third_party/glslang',
221222
'//third_party/SwiftShader',
222223
'//third_party/vulkan-headers',
223224
'//third_party/vulkan-loader',

src/tests/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ if (is_win || is_linux || is_android || is_mac) {
276276
if (angle_enable_vulkan && !is_mac) {
277277
sources += angle_white_box_perf_tests_vulkan_sources
278278
deps += [
279-
"$angle_glslang_dir:glslang_sources",
279+
"$angle_glslang_dir:glslang_lib_sources",
280280
"$angle_root/src/common/vulkan:angle_vulkan_entry_points",
281281
]
282282
}
@@ -1310,7 +1310,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
13101310
public_deps = [
13111311
":angle_deqp_framework_egl",
13121312
":angle_deqp_glshared",
1313-
"${angle_glslang_dir}:glslang_sources",
1313+
"${angle_glslang_dir}:glslang_lib_sources",
13141314
"${angle_spirv_tools_dir}:spvtools_val",
13151315
]
13161316
public_configs = [ ":angle_deqp_khr_common_config" ]

0 commit comments

Comments
 (0)