diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-07-21 14:27:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-22 01:03:06 +0000 |
| commit | cd1416efbc7af6f115dbaa09dce48e075d1d96ca (patch) | |
| tree | 3f4ddbc475a167107929da6f670b7832b97f2c93 /src/gpu/vk | |
| parent | 97d4cf0e7eb15340b1f513ff8cfba4e55ee3acf2 (diff) | |
Add support for semaphores to be inserted on GrContext flush
This also moves the logic of inserting semaphores down into GrDrawingManager
and finishFlush on GrGpu. With it being on finishFlush, there should be no
issues when the DrawingManager starts respecting the proxy passed in assuming
it always calls finishFlush at the end (which it should).
Bug: skia:
Change-Id: I925c2a289dcbbb9159b9120878af1d34f21a2dc7
Reviewed-on: https://skia-review.googlesource.com/25641
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/vk')
| -rw-r--r-- | src/gpu/vk/GrVkCopyManager.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkGpu.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp index f0dc60297b..3851bc650a 100644 --- a/src/gpu/vk/GrVkCopyManager.cpp +++ b/src/gpu/vk/GrVkCopyManager.cpp @@ -160,7 +160,7 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu, if (gpu->vkCaps().newCBOnPipelineChange()) { // We bind a new pipeline here for the copy so we must start a new command buffer. - gpu->finishFlush(); + gpu->finishFlush(0, nullptr); } GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(dst->asRenderTarget()); diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index d7094b7c18..5979ae0f49 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -1467,8 +1467,9 @@ void GrVkGpu::addImageMemoryBarrier(VkPipelineStageFlags srcStageMask, barrier); } -void GrVkGpu::finishFlush() { - // Submit the current command buffer to the Queue +void GrVkGpu::onFinishFlush(bool insertedSemaphore) { + // Submit the current command buffer to the Queue. Whether we inserted semaphores or not does + // not effect what we do here. this->submitCommandBuffer(kSkip_SyncQueue); } diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h index 419e9e3ad6..d81c2e6c22 100644 --- a/src/gpu/vk/GrVkGpu.h +++ b/src/gpu/vk/GrVkGpu.h @@ -125,8 +125,6 @@ public: GrVkRenderTarget*, const SkIRect& bounds); - void finishFlush() override; - GrFence SK_WARN_UNUSED_RESULT insertFence() override; bool waitFence(GrFence, uint64_t timeout) override; void deleteFence(GrFence) const override; @@ -210,6 +208,8 @@ private: GrPixelConfig config, GrBuffer* transferBuffer, size_t offset, size_t rowBytes) override; + void onFinishFlush(bool insertedSemaphores) override; + // Ends and submits the current command buffer to the queue and then creates a new command // buffer and begins it. If sync is set to kForce_SyncQueue, the function will wait for all // work in the queue to finish before returning. If this GrVkGpu object has any semaphores in |