D3D: Return Incomplete when failing to load a program binary.

When Stop is returned, the ProgramD3D::GetExecutableTask attempts to pop an error that has not been set. Returning Incomplete matches the other error cases in program binary loading. BUG=962439 Change-Id: I70895ddc706045620e3df219681982357b7b63e5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1620914Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

D3D: Return Incomplete when failing to load a program binary.
344ecaa6 · Geoff Lang · Commit Bot · 8224a58b · 344ecaa6
Commit 344ecaa6 authored May 21, 2019 by Geoff Lang Committed by Commit Bot May 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -531,6 +531,8 @@ class ProgramD3D::GetExecutableTask : public Closure, public d3d::Context

    void popError(d3d::Context *context)
    {
+        ASSERT(mStoredFile);
+        ASSERT(mStoredFunction);
        context->handleResult(mStoredHR, mStoredMessage.c_str(), mStoredFile, mStoredFunction,
                              mStoredLine);
    }
@@ -865,7 +867,7 @@ class ProgramD3D::LoadBinaryTask : public ProgramD3D::GetExecutableTask
        if (!mDataCopySucceeded)
        {
            mInfoLog << "Failed to copy program binary data to local buffer.";
-            return angle::Result::Stop;
+            return angle::Result::Incomplete;
        }

        gl::BinaryInputStream stream(mStreamData.data(), mStreamData.size());