Generate OUT_OF_MEMORY when compiler initialization fails.

INVALID_OPERATION implies that the error is recoverable. Change-Id: Iaa13293168f66f46864e5e4c0ab7d7c53c97e8fd Reviewed-on: https://chromium-review.googlesource.com/383131Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Generate OUT_OF_MEMORY when compiler initialization fails.
65d17e56 · Geoff Lang · Commit Bot · c955058b · 65d17e56 · 65d17e56
Commit 65d17e56 authored Sep 08, 2016 by Geoff Lang Committed by Commit Bot Sep 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

HLSLCompiler.cpp src/libANGLE/renderer/d3d/HLSLCompiler.cpp +3 -2

ProgramD3D.cpp src/libANGLE/renderer/d3d/ProgramD3D.cpp +6 -1

No files found.
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -136,7 +136,8 @@ gl::Error HLSLCompiler::initialize()
    if (!mD3DCompilerModule)
    {
-        return gl::Error(GL_INVALID_OPERATION, "No D3D compiler module found - aborting!\n");
+        ERR("D3D compiler module not found.");
+        return gl::Error(GL_OUT_OF_MEMORY, "D3D compiler module not found.");
    }
    mD3DCompileFunc = reinterpret_cast<pD3DCompile>(GetProcAddress(mD3DCompilerModule, "D3DCompile"));
@@ -155,7 +156,7 @@ gl::Error HLSLCompiler::initialize()
    if (mD3DCompileFunc == nullptr)
    {
-        return gl::Error(GL_INVALID_OPERATION, "Error finding D3DCompile entry point");
+        return gl::Error(GL_OUT_OF_MEMORY, "Error finding D3DCompile entry point.");
    }
    mInitialized = true;

--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1433,7 +1433,12 @@ LinkResult ProgramD3D::link(const gl::ContextState &data, gl::InfoLog &infoLog)
    gatherTransformFeedbackVaryings(varyingPacking);
    LinkResult result = compileProgramExecutables(data, infoLog);
-    if (result.error.isError() || !result.linkSuccess)
+    if (result.error.isError())
+    {
+        infoLog << result.error.getMessage();
+        return result;
+    }
+    else if (!result.linkSuccess)
    {
        infoLog << "Failed to create D3D shaders.";
        return result;