aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2017-06-15 15:25:38 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-15 19:49:18 +0000
commit66366c697853e906d961ae691e2bc5209cdcfa62 (patch)
treef90de7fef9bd094ded9f6497c0004876694cca61 /dm
parent000182881a65ef4b12ca3739d47c5e21e79ca919 (diff)
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 <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Forrest Reiling <freiling@google.com>
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp32
1 files changed, 1 insertions, 31 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index d92b5ae3ce..58ccb1f4e8 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1432,36 +1432,6 @@ bool IsRenderingGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
bool IsNullGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
return type == GrContextFactory::kNullGL_ContextType;
}
-const char* ContextTypeName(GrContextFactory::ContextType contextType) {
- switch (contextType) {
- case GrContextFactory::kGL_ContextType:
- return "OpenGL";
- case GrContextFactory::kGLES_ContextType:
- return "OpenGLES";
- case GrContextFactory::kANGLE_D3D9_ES2_ContextType:
- return "ANGLE D3D9 ES2";
- case GrContextFactory::kANGLE_D3D11_ES2_ContextType:
- return "ANGLE D3D11 ES2";
- case GrContextFactory::kANGLE_D3D11_ES3_ContextType:
- return "ANGLE D3D11 ES3";
- case GrContextFactory::kANGLE_GL_ES2_ContextType:
- return "ANGLE GL ES2";
- case GrContextFactory::kANGLE_GL_ES3_ContextType:
- return "ANGLE GL ES3";
- case GrContextFactory::kCommandBuffer_ContextType:
- return "Command Buffer";
- case GrContextFactory::kMESA_ContextType:
- return "Mesa";
- case GrContextFactory::kNullGL_ContextType:
- return "Null GL";
- case GrContextFactory::kDebugGL_ContextType:
- return "Debug GL";
- case GrContextFactory::kVulkan_ContextType:
- return "Vulkan";
- }
- SkDEBUGFAIL("Unreachable");
- return "Unknown";
-}
#else
bool IsGLContextType(int) { return false; }
bool IsVulkanContextType(int) { return false; }
@@ -1494,7 +1464,7 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex
if (contextTypeFilter && !(*contextTypeFilter)(contextType)) {
continue;
}
- ReporterContext ctx(reporter, SkString(ContextTypeName(contextType)));
+ ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType)));
if (ctxInfo.grContext()) {
(*test)(reporter, ctxInfo);
}