Properly fail upon program binary version mismatch

Return angle::Result::Stop instead of Incomplete when Program::deserialize detects version mismatch. This causes the caller, Program::loadBinary, to stop trying to load it. At least with the Vulkan backend, trying to load it results in a crash. Added test case to ProgramBinariesAcrossPlatforms which exhibits the old crash. Bug: angleproject:5567 Change-Id: I2ebb27cee0aa895855504f758992b4dfec3f4aa3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2639078Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Steven An <stevenan@google.com>

Properly fail upon program binary version mismatch
ff5f715e · Steven An · Commit Bot · 9ccd3536 · ff5f715e · ff5f715e
Commit ff5f715e authored Jan 19, 2021 by Steven An Committed by Commit Bot Jan 22, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Program.cpp src/libANGLE/Program.cpp +3 -3

ProgramBinaryTest.cpp src/tests/gl_tests/ProgramBinaryTest.cpp +1 -0

No files found.
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -4753,7 +4753,7 @@ angle::Result Program::deserialize(const Context *context,
        0)
    {
        infoLog << "Invalid program binary version.";
-        return angle::Result::Incomplete;
+        return angle::Result::Stop;
    }

    int majorVersion = stream.readInt<int>();
@@ -4762,7 +4762,7 @@ angle::Result Program::deserialize(const Context *context,
        minorVersion != context->getClientMinorVersion())
    {
        infoLog << "Cannot load program binaries across different ES context versions.";
-        return angle::Result::Incomplete;
+        return angle::Result::Stop;
    }

    mState.mExecutable->load(&stream);
@@ -4874,7 +4874,7 @@ angle::Result Program::deserialize(const Context *context,
        context->getFrontendFeatures().disableProgramCachingForTransformFeedback.enabled)
    {
        infoLog << "Current driver does not support transform feedback in binary programs.";
-        return angle::Result::Incomplete;
+        return angle::Result::Stop;
    }

    ASSERT(mState.mExecutable->mLinkedTransformFeedbackVaryings.empty());

--- a/src/tests/gl_tests/ProgramBinaryTest.cpp
+++ b/src/tests/gl_tests/ProgramBinaryTest.cpp
@@ -1361,5 +1361,6 @@ ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms,
                       PlatformsWithLinkResult(ES2_D3D11(),         ES2_D3D9(),             false        ), // Switching from D3D11 to D3D9 shouldn't work
                       PlatformsWithLinkResult(ES2_D3D9(),          ES2_D3D11(),            false        ), // Switching from D3D9 to D3D11 shouldn't work
                       PlatformsWithLinkResult(ES2_D3D11(),         ES3_D3D11(),            false        ), // Switching to newer client version shouldn't work
+                       PlatformsWithLinkResult(ES3_VULKAN(),        ES31_VULKAN(),          false        ), // Switching to newer client version shouldn't work with Vulkan
                       );
 // clang-format on