commit e6bfb7daf0cfe0cda865d59d88b7ab456b4040ac
author Greg Daniel <egdaniel@google.com> Wed Apr 17 15:26:11 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 17 20:03:29 2019 +0000
tree 9de2a4a25dda4aafdcfaaeff45813e13e706c5d8
parent 6f9047027be329719bb9fe79e6f892724e6a0fa2

Add struct to wrap all the gpu flush options.

Bug: skia:8802
Change-Id: Ia92807034a8f54067cead59e29c233f91e11f175
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208674
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 389a49a..3742fa4 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -1876,8 +1876,7 @@
 }
 
 void GrVkGpu::onFinishFlush(GrSurfaceProxy* proxy, SkSurface::BackendSurfaceAccess access,
-                            GrFlushFlags flags, bool insertedSemaphore,
-                            GrGpuFinishedProc finishedProc, GrGpuFinishedContext finishedContext) {
+                            const GrFlushInfo& info) {
     // Submit the current command buffer to the Queue. Whether we inserted semaphores or not does
     // not effect what we do here.
     if (proxy && access == SkSurface::BackendSurfaceAccess::kPresent) {
@@ -1892,10 +1891,10 @@
         }
         image->prepareForPresent(this);
     }
-    if (flags & kSyncCpu_GrFlushFlag) {
-        this->submitCommandBuffer(kForce_SyncQueue, finishedProc, finishedContext);
+    if (info.fFlags & kSyncCpu_GrFlushFlag) {
+        this->submitCommandBuffer(kForce_SyncQueue, info.fFinishedProc, info.fFinishedContext);
     } else {
-        this->submitCommandBuffer(kSkip_SyncQueue, finishedProc, finishedContext);
+        this->submitCommandBuffer(kSkip_SyncQueue, info.fFinishedProc, info.fFinishedContext);
     }
 }