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/GrDrawingManager.h | |
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/GrDrawingManager.h')
-rw-r--r-- | src/gpu/GrDrawingManager.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h index 6a1ad19d93..e7995fd80d 100644 --- a/src/gpu/GrDrawingManager.h +++ b/src/gpu/GrDrawingManager.h @@ -64,15 +64,13 @@ public: void flushIfNecessary() { if (fContext->getResourceCache()->requestsFlush()) { - this->internalFlush(nullptr, GrResourceCache::kCacheRequested, 0, nullptr); + this->internalFlush(nullptr, GrResourceCache::kCacheRequested); } } static bool ProgramUnitTest(GrContext* context, int maxStages, int maxLevels); - GrSemaphoresSubmitted prepareSurfaceForExternalIO(GrSurfaceProxy*, - int numSemaphores, - GrBackendSemaphore backendSemaphores[]); + void prepareSurfaceForExternalIO(GrSurfaceProxy*); void addOnFlushCallbackObject(GrOnFlushCallbackObject*); void testingOnly_removeOnFlushCallbackObject(GrOnFlushCallbackObject*); @@ -95,16 +93,10 @@ private: void abandon(); void cleanup(); void reset(); - GrSemaphoresSubmitted flush(GrSurfaceProxy* proxy, - int numSemaphores = 0, - GrBackendSemaphore backendSemaphores[] = nullptr) { - return this->internalFlush(proxy, GrResourceCache::FlushType::kExternal, - numSemaphores, backendSemaphores); + void flush(GrSurfaceProxy* proxy) { + this->internalFlush(proxy, GrResourceCache::FlushType::kExternal); } - GrSemaphoresSubmitted internalFlush(GrSurfaceProxy*, - GrResourceCache::FlushType, - int numSemaphores, - GrBackendSemaphore backendSemaphores[]); + void internalFlush(GrSurfaceProxy*, GrResourceCache::FlushType); friend class GrContext; // for access to: ctor, abandon, reset & flush friend class GrContextPriv; // access to: flush |