diff options
author | 2017-07-22 17:33:48 +0000 | |
---|---|---|
committer | 2017-07-22 17:34:00 +0000 | |
commit | 8724b4609996eb6369b454611e31b065f3d8d2cf (patch) | |
tree | 72c35e7f426c99799499e942dc4689a2488b7bef /src/gpu/GrGpu.cpp | |
parent | f5d4d86d857fd3619ae5f253cb8cc2552f552542 (diff) |
Revert "Add support for semaphores to be inserted on GrContext flush"
This reverts commit cd1416efbc7af6f115dbaa09dce48e075d1d96ca.
Reason for revert: speculative, to try to fix roll see gpu_tests.pixel_integration_test.PixelIntegrationTest.Pixel_GpuRasterization_ConcavePaths
Original change's description:
> 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>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I9c5b9cf8c060193e1861dbb8f0c10fb11dfb5249
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25980
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/gpu/GrGpu.cpp')
-rw-r--r-- | src/gpu/GrGpu.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 2f4b3f784e..afe3956747 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -8,7 +8,6 @@ #include "GrGpu.h" -#include "GrBackendSemaphore.h" #include "GrBackendSurface.h" #include "GrBuffer.h" #include "GrCaps.h" @@ -20,7 +19,6 @@ #include "GrRenderTargetPriv.h" #include "GrResourceCache.h" #include "GrResourceProvider.h" -#include "GrSemaphore.h" #include "GrStencilAttachment.h" #include "GrStencilSettings.h" #include "GrSurfacePriv.h" @@ -515,26 +513,3 @@ bool GrGpu::SamplePatternComparator::operator()(const SamplePattern& a, } return false; // Equal. } - -GrSemaphoresSubmitted GrGpu::finishFlush(int numSemaphores, - GrBackendSemaphore backendSemaphores[]) { - if (this->caps()->fenceSyncSupport()) { - for (int i = 0; i < numSemaphores; ++i) { - sk_sp<GrSemaphore> semaphore; - if (backendSemaphores[i].isInitialized()) { - semaphore = fContext->resourceProvider()->wrapBackendSemaphore( - backendSemaphores[i], kBorrow_GrWrapOwnership); - } else { - semaphore = fContext->resourceProvider()->makeSemaphore(false); - } - this->insertSemaphore(semaphore, false); - - if (!backendSemaphores[i].isInitialized()) { - semaphore->setBackendSemaphore(&backendSemaphores[i]); - } - } - } - this->onFinishFlush((numSemaphores > 0 && this->caps()->fenceSyncSupport())); - return this->caps()->fenceSyncSupport() ? GrSemaphoresSubmitted::kYes - : GrSemaphoresSubmitted::kNo; -} |