Vulkan: flushCommandsAndEndRenderPass during glFenceSync()

The description for glFenceSync states: glFenceSync — create a new sync object and insert it into the GL command stream ANGLE needs to break the render pass and flush any prior commands to ensure that the newly created Fence object lands with the correct ordering. This will be done by calling ContextVk::flushCommandsAndEndRenderPass() before creating the Vulkan Event object. Bug: angleproject:5306 Change-Id: I3a460bb559acf8eb4b3041065ec743938d44d823 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2582199Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>

Vulkan: flushCommandsAndEndRenderPass during glFenceSync()
e8c5525c · Tim Van Patten · Commit Bot · cbc1220e · e8c5525c · e8c5525c
Commit e8c5525c authored Dec 09, 2020 by Tim Van Patten Committed by Commit Bot Dec 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

SyncVk.cpp src/libANGLE/renderer/vulkan/SyncVk.cpp +4 -0

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

No files found.
--- a/src/libANGLE/renderer/vulkan/SyncVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SyncVk.cpp
@@ -87,6 +87,10 @@ angle::Result SyncHelper::initialize(ContextVk *contextVk)
 {
    ASSERT(!mEvent.valid());

+    // Break the current render pass to ensure the proper ordering of the sync object in the
+    // commands.
+    ANGLE_TRY(contextVk->flushCommandsAndEndRenderPass());
+
    RendererVk *renderer = contextVk->getRenderer();
    VkDevice device      = renderer->getDevice();


--- a/src/tests/gl_tests/FenceSyncTests.cpp
+++ b/src/tests/gl_tests/FenceSyncTests.cpp
@@ -292,8 +292,6 @@ TEST_P(FenceSyncTest, MultipleFenceDraw)
        {
            GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
            ASSERT_GL_NO_ERROR();
-            // Force the fence to be created
-            glFlush();

            drawGreen      = !drawGreen;
            GLuint program = 0;