Fix disable_native_parallel_compile workaround condition.

This workaround should only be enabled when ANGLE is built with TSAN on. Bug: chromium:1094869 Change-Id: If527457c11ce744b543ac69761cc64235d2f1dd8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2267420Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org>

Fix disable_native_parallel_compile workaround condition.
e2de2c1c · Jonah Ryan-Davis · Commit Bot · bdf91e5f · e2de2c1c · e2de2c1c
Commit e2de2c1c authored Jun 25, 2020 by Jonah Ryan-Davis Committed by Commit Bot Jun 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

RendererGL.cpp src/libANGLE/renderer/gl/RendererGL.cpp +0 -2

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +7 -2

No files found.
--- a/src/libANGLE/renderer/gl/RendererGL.cpp
+++ b/src/libANGLE/renderer/gl/RendererGL.cpp
@@ -445,12 +445,10 @@ unsigned int RendererGL::getMaxWorkerContexts()

 bool RendererGL::hasNativeParallelCompile()
 {
-#ifdef THREAD_SANITIZER
    if (mFeatures.disableNativeParallelCompile.enabled)
    {
        return false;
    }
-#endif
    return mFunctions->maxShaderCompilerThreadsKHR != nullptr ||
           mFunctions->maxShaderCompilerThreadsARB != nullptr;
 }

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1776,9 +1776,14 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
    }
    ANGLE_FEATURE_CONDITION(features, disableGPUSwitchingSupport, isDualGPUMacWithNVIDIA);

-    // Workaround issue in NVIDIA GL driver on Linux
+    // Workaround issue in NVIDIA GL driver on Linux when TSAN is enabled
    // http://crbug.com/1094869
-    ANGLE_FEATURE_CONDITION(features, disableNativeParallelCompile, IsLinux() && isNvidia);
+    bool isTSANBuild = false;
+#ifdef THREAD_SANITIZER
+    isTSANBuild = true;
+#endif
+    ANGLE_FEATURE_CONDITION(features, disableNativeParallelCompile,
+                            isTSANBuild && IsLinux() && isNvidia);
 }

 void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)