Vulkan: Fix releasing Programs that are in use.

The bug would only manifest after a glUseProgram(0) at a specific time. Fix the bug by releasing the uniform buffer to the Renderer instead. Bug: angleproject:2397 Change-Id: Ia071da5af00dfc740e0fc20864d41f7b3e0afda4 Reviewed-on: https://chromium-review.googlesource.com/1110712 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org>

Vulkan: Fix releasing Programs that are in use.
caaff169 · Jamie Madill · Commit Bot · 8a4c49fb · caaff169 · caaff169
Commit caaff169 authored Jun 22, 2018 by Jamie Madill Committed by Commit Bot Jun 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

ProgramVk.cpp src/libANGLE/renderer/vulkan/ProgramVk.cpp +5 -3

StateChangeTest.cpp src/tests/gl_tests/StateChangeTest.cpp +2 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -176,13 +176,15 @@ vk::Error ProgramVk::reset(ContextVk *contextVk)
    }
    mPipelineLayout.reset();

+    RendererVk *renderer = contextVk->getRenderer();
    for (auto &uniformBlock : mDefaultUniformBlocks)
    {
-        uniformBlock.storage.destroy(device);
+        uniformBlock.storage.release(renderer);
    }

-    mEmptyUniformBlockStorage.memory.destroy(device);
-    mEmptyUniformBlockStorage.buffer.destroy(device);
+    Serial currentSerial = renderer->getCurrentQueueSerial();
+    renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.memory);
+    renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.buffer);

    mLinkedFragmentModule.destroy(device);
    mLinkedVertexModule.destroy(device);

--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -2054,6 +2054,8 @@ TEST_P(SimpleStateChangeTest, ReleaseShaderInUseThatReadsFromUniforms)

    glDisableVertexAttribArray(positionLocation);

+    glUseProgram(0);
+
    // Verify we drew red in the end since thats the last draw.
    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, 0, GLColor::red);
 }