From a5cb781c17c09e01655defd0a84b431996b6a015 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Fri, 16 Jun 2017 09:45:32 -0400 Subject: Revert "Revert "Add API for flushing surfaces with gpu semaphores"" This reverts commit 7292231905c34ed290ba479338f26b56ae2a7792. This change relands the original plus the follow on change: https://skia-review.googlesource.com/20059. Additionally it adds a blacklist for the mac intel bots which don't see to respect the added fences on the GPU. Original change's description: > Revert "Add API for flushing surfaces with gpu semaphores" > > This reverts commit 66366c697853e906d961ae691e2bc5209cdcfa62. > > Reason for revert: Failing test on mac bots > > Original change's description: > > Add API for flushing surfaces with gpu semaphores > > > > BUG=skia: > > > > Change-Id: Ia4bfef784cd5f2516ceccafce958be18a86f91d1 > > Reviewed-on: https://skia-review.googlesource.com/11488 > > Commit-Queue: Greg Daniel > > Reviewed-by: Brian Salomon > > Reviewed-by: Forrest Reiling > > TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com,freiling@google.com > > Change-Id: I75633a2732d2d48b1926f9ad818a9f1a9196d211 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/20063 > Commit-Queue: Greg Daniel > Reviewed-by: Greg Daniel TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com,freiling@google.com Change-Id: I4dc6c0e1deb0398eeb165a34f0a26af7a58259f1 Reviewed-on: https://skia-review.googlesource.com/20141 Commit-Queue: Greg Daniel Reviewed-by: Greg Daniel --- tests/OnFlushCallbackTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/OnFlushCallbackTest.cpp') diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp index f4dd25f3fe..81cd5daa1d 100644 --- a/tests/OnFlushCallbackTest.cpp +++ b/tests/OnFlushCallbackTest.cpp @@ -9,6 +9,7 @@ #if SK_SUPPORT_GPU +#include "GrBackendSemaphore.h" #include "GrClip.h" #include "GrContextPriv.h" #include "GrDefaultGeoProcFactory.h" @@ -575,7 +576,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(OnFlushCallbackTest, reporter, ctxInfo) { rtc->drawRect(GrNoClip(), std::move(paint), GrAA::kNo, SkMatrix::I(), r); } - rtc->prepareForExternalIO(); + rtc->prepareForExternalIO(0, nullptr); SkBitmap readBack; readBack.allocN32Pixels(kFinalWidth, kFinalHeight); -- cgit v1.2.3