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 --- tools/gpu/GrContextFactory.h | 31 +++++++++++++++++++++++++++++++ tools/gpu/GrTest.cpp | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h index dff8d5180c..508249b8d8 100644 --- a/tools/gpu/GrContextFactory.h +++ b/tools/gpu/GrContextFactory.h @@ -83,6 +83,37 @@ public: } } + static const char* ContextTypeName(ContextType contextType) { + switch (contextType) { + case kGL_ContextType: + return "OpenGL"; + case kGLES_ContextType: + return "OpenGLES"; + case kANGLE_D3D9_ES2_ContextType: + return "ANGLE D3D9 ES2"; + case kANGLE_D3D11_ES2_ContextType: + return "ANGLE D3D11 ES2"; + case kANGLE_D3D11_ES3_ContextType: + return "ANGLE D3D11 ES3"; + case kANGLE_GL_ES2_ContextType: + return "ANGLE GL ES2"; + case kANGLE_GL_ES3_ContextType: + return "ANGLE GL ES3"; + case kCommandBuffer_ContextType: + return "Command Buffer"; + case kMESA_ContextType: + return "Mesa"; + case kNullGL_ContextType: + return "Null GL"; + case kDebugGL_ContextType: + return "Debug GL"; + case kVulkan_ContextType: + return "Vulkan"; + } + SkDEBUGFAIL("Unreachable"); + return "Unknown"; + } + explicit GrContextFactory(const GrContextOptions& opts); GrContextFactory(); diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index f182a966bc..93e5f6e3b9 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -346,7 +346,9 @@ public: bool waitFence(GrFence, uint64_t) override { return true; } void deleteFence(GrFence) const override {} - sk_sp SK_WARN_UNUSED_RESULT makeSemaphore() override { return nullptr; } + sk_sp SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned) override { return nullptr; } + sk_sp wrapBackendSemaphore(const GrBackendSemaphore& semaphore, + GrWrapOwnership ownership) override { return nullptr; } void insertSemaphore(sk_sp semaphore, bool flush) override {} void waitSemaphore(sk_sp semaphore) override {} sk_sp prepareTextureForCrossContextUsage(GrTexture*) override { return nullptr; } -- cgit v1.2.3