Avoid calling debug annotator during D3D shader compilation

In Renderer11::compileToExecutable and HLSLCompiler::compileToBinary. Because they are called from a worker thread, there are problems with D3D debug annotator being accessed from multiple threads. Previous fix to guard annotator accesses by a mutex reduced flakiness, but not completely, maybe due to a D3D erroneously thinking there is multithreaded access while there is none. Bug: angleproject:3780 Change-Id: I8beea76b6d21f3378462992bbfab916c9db6b1ef Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1742642 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Avoid calling debug annotator during D3D shader compilation
ba72f9a9 · Yuly Novikov · Commit Bot · abce77a6 · ba72f9a9 · ba72f9a9
Commit ba72f9a9 authored Aug 07, 2019 by Yuly Novikov Committed by Commit Bot Aug 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 17 deletions

HLSLCompiler.cpp src/libANGLE/renderer/d3d/HLSLCompiler.cpp +6 -9

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +6 -8

No files found.
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -219,15 +219,12 @@ angle::Result HLSLCompiler::compileToBinary(d3d::Context *context,
 #endif
    ASSERT(mD3DCompileFunc);

-#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
-    if (gl::DebugAnnotationsActive())
-    {
-        std::string sourcePath = getTempPath();
-        std::ostringstream stream;
-        stream << "#line 2 \"" << sourcePath << "\"\n\n" << hlsl;
-        std::string sourceText = stream.str();
-        writeFile(sourcePath.c_str(), sourceText.c_str(), sourceText.size());
-    }
+#if !defined(ANGLE_ENABLE_WINDOWS_STORE) && defined(ANGLE_ENABLE_DEBUG_TRACE)
+    std::string sourcePath = getTempPath();
+    std::ostringstream stream;
+    stream << "#line 2 \"" << sourcePath << "\"\n\n" << hlsl;
+    std::string sourceText = stream.str();
+    writeFile(sourcePath.c_str(), sourceText.c_str(), sourceText.size());
 #endif

    const D3D_SHADER_MACRO *macros = overrideMacros ? overrideMacros : nullptr;

--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -2773,14 +2773,12 @@ angle::Result Renderer11::compileToExecutable(d3d::Context *context,

    UINT flags = D3DCOMPILE_OPTIMIZATION_LEVEL2;

-    if (gl::DebugAnnotationsActive())
-    {
-#ifndef NDEBUG
-        flags = D3DCOMPILE_SKIP_OPTIMIZATION;
-#endif
-
-        flags |= D3DCOMPILE_DEBUG;
-    }
+#if defined(ANGLE_ENABLE_DEBUG_TRACE)
+#    ifndef NDEBUG
+    flags = D3DCOMPILE_SKIP_OPTIMIZATION;
+#    endif  // NDEBUG
+    flags |= D3DCOMPILE_DEBUG;
+#endif  // defined(ANGLE_ENABLE_DEBUG_TRACE)

    if (workarounds.enableIEEEStrictness)
        flags |= D3DCOMPILE_IEEE_STRICTNESS;