Revert "Re-resubmit "Compile the D3D11 VS and PS on separate threads at GL link time""
Fails clang-win again. Apparently Clang mimics MSVS.
This reverts commit af1bdff62ec4cc80b47fbac7e5d973f6f7225036.
Change-Id: I48a503889a9e905fcdc9f101dbf98f7cb7912279
Reviewed-on: https://chromium-review.googlesource.com/250882
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 0e6b653..a368d29 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -6,23 +6,13 @@
// ProgramD3D.cpp: Defines the rx::ProgramD3D class which implements rx::ProgramImpl.
-#include "libANGLE/features.h"
-
-#if ANGLE_MULTITHREADED_D3D_SHADER_COMPILE == ANGLE_ENABLED
-// <future> requires _HAS_EXCEPTIONS to be defined
-#ifdef _HAS_EXCEPTIONS
-#undef _HAS_EXCEPTIONS
-#endif // _HAS_EXCEPTIONS
-#define _HAS_EXCEPTIONS 1
-#include <future> // For std::async
-#endif // ANGLE_MULTITHREADED_D3D_SHADER_COMPILE == ANGLE_ENABLED
-
#include "libANGLE/renderer/d3d/ProgramD3D.h"
#include "common/utilities.h"
#include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Program.h"
+#include "libANGLE/features.h"
#include "libANGLE/renderer/d3d/DynamicHLSL.h"
#include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/ShaderD3D.h"
@@ -953,7 +943,6 @@
}
else if (!infoLog)
{
- // This isn't thread-safe, so we should ensure that we always pass in an infoLog if using multiple threads.
std::vector<char> tempCharBuffer(tempInfoLog.getLength() + 3);
tempInfoLog.getLog(tempInfoLog.getLength(), NULL, &tempCharBuffer[0]);
ERR("Error compiling dynamic vertex executable:\n%s\n", &tempCharBuffer[0]);
@@ -969,49 +958,18 @@
ShaderD3D *vertexShaderD3D = ShaderD3D::makeShaderD3D(vertexShader->getImplementation());
ShaderD3D *fragmentShaderD3D = ShaderD3D::makeShaderD3D(fragmentShader->getImplementation());
- gl::Error vertexShaderResult(GL_NO_ERROR);
- gl::InfoLog tempVertexShaderInfoLog;
-
-#if ANGLE_MULTITHREADED_D3D_SHADER_COMPILE == ANGLE_ENABLED
- // Use an async task to begin compiling the vertex shader asynchronously on its own task.
- std::future<ShaderExecutableD3D*> vertexShaderTask = std::async([this, vertexShader, &tempVertexShaderInfoLog, &vertexShaderResult]()
+ gl::VertexFormat defaultInputLayout[gl::MAX_VERTEX_ATTRIBS];
+ GetDefaultInputLayoutFromShader(vertexShader->getActiveAttributes(), defaultInputLayout);
+ ShaderExecutableD3D *defaultVertexExecutable = NULL;
+ gl::Error error = getVertexExecutableForInputLayout(defaultInputLayout, &defaultVertexExecutable, &infoLog);
+ if (error.isError())
{
-#endif // ANGLE_MULTITHREADED_D3D_SHADER_COMPILE
+ return LinkResult(false, error);
+ }
- gl::VertexFormat defaultInputLayout[gl::MAX_VERTEX_ATTRIBS];
- GetDefaultInputLayoutFromShader(vertexShader->getActiveAttributes(), defaultInputLayout);
- ShaderExecutableD3D *defaultVertexExecutable = NULL;
- vertexShaderResult = getVertexExecutableForInputLayout(defaultInputLayout, &defaultVertexExecutable, &tempVertexShaderInfoLog);
-
-#if ANGLE_MULTITHREADED_D3D_SHADER_COMPILE == ANGLE_ENABLED
- return defaultVertexExecutable;
- });
-#endif // ANGLE_MULTITHREADED_D3D_SHADER_COMPILE
-
- // Continue to compile the pixel shader on the main thread
std::vector<GLenum> defaultPixelOutput = GetDefaultOutputLayoutFromShader(getPixelShaderKey());
ShaderExecutableD3D *defaultPixelExecutable = NULL;
- gl::Error error = getPixelExecutableForOutputLayout(defaultPixelOutput, &defaultPixelExecutable, &infoLog);
-
-#if ANGLE_MULTITHREADED_D3D_SHADER_COMPILE == ANGLE_ENABLED
- // Call .get() on the vertex shader compilation. This waits until the task is complete before returning
- ShaderExecutableD3D *defaultVertexExecutable = vertexShaderTask.get();
-#endif // ANGLE_MULTITHREADED_D3D_SHADER_COMPILE
-
- // Combine the temporary infoLog with the real one
- if (tempVertexShaderInfoLog.getLength() > 0)
- {
- std::vector<char> tempCharBuffer(tempVertexShaderInfoLog.getLength() + 3);
- tempVertexShaderInfoLog.getLog(tempVertexShaderInfoLog.getLength(), NULL, &tempCharBuffer[0]);
- infoLog.append(&tempCharBuffer[0]);
- }
-
- if (vertexShaderResult.isError())
- {
- return LinkResult(false, vertexShaderResult);
- }
-
- // If the pixel shader compilation failed, then return error
+ error = getPixelExecutableForOutputLayout(defaultPixelOutput, &defaultPixelExecutable, &infoLog);
if (error.isError())
{
return LinkResult(false, error);