Commit b0a9de95 by Shahbaz Youssefi Committed by Commit Bot

Fix assert in angle_deqp_khr_gles* executables

The //build/config/gcc:symbol_visibility_hidden config was removed in an attempt to improve stack traces on Linux. However, this resulted in the in-class-inline-functions in glslang to be weak symbols. The KHR dEQP tests link against glslang as well as libGLESv2.so, resulting in angle_deqp_khr_gles*_tests to link those weak symbols. Due to glslang's usage of a global variable in InitializeDll.cpp, a bug is created where ANGLE sometimes calls into its own copy of glslang and sometimes the KHR dEQP's version, with the two copies of the global variable being inconsistent. Bug: angleproject:4123 Change-Id: I0cfe3236117b1219db4fea4495e1583334c04fbe Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1926887Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 05af7590
...@@ -140,7 +140,13 @@ if (angle_has_build && is_clang) { ...@@ -140,7 +140,13 @@ if (angle_has_build && is_clang) {
# Disabled to enable better stack traces. # Disabled to enable better stack traces.
if (angle_better_stack_traces) { if (angle_better_stack_traces) {
angle_remove_configs += [ "//build/config/gcc:symbol_visibility_hidden" ] # This line causes in-class-inline-functions in glslang to be weak symbols. The KHR dEQP tests
# link against glslang as well as libGLESv2.so, resulting in angle_deqp_khr_gles*_tests to link
# those weak symbols. Due to glslang's usage of a global variable in InitializeDll.cpp, a bug
# is created where ANGLE sometimes calls into its own copy of glslang and sometimes the KHR
# dEQP's version, with the two copies of the global variable being inconsistent.
# Commented out until the underlying issue is resolved. http://anglebug.com/4123
# angle_remove_configs += [ "//build/config/gcc:symbol_visibility_hidden" ]
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment