diff options
author | kkinnunen <kkinnunen@nvidia.com> | 2015-12-03 23:04:50 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-03 23:04:50 -0800 |
commit | a18a8bca24f8b927c360e36f23d2fd08c6378805 (patch) | |
tree | 5651beb3fe23c8c0c9d26fa123400d66b27da0bf /src/gpu | |
parent | 6dea83f244cfdea52901eef6b31cee60b07a8ea0 (diff) |
Skip dm GPU configs when context creation fails
Skip dm GPU configs when context creation fails instead of stopping
the whole dm run.
Review URL: https://codereview.chromium.org/1497713002
Diffstat (limited to 'src/gpu')
-rwxr-xr-x | src/gpu/GrContextFactory.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp index 424b3fda3a..097b99b0b7 100755 --- a/src/gpu/GrContextFactory.cpp +++ b/src/gpu/GrContextFactory.cpp @@ -80,10 +80,6 @@ GrContextFactory::ContextInfo* GrContextFactory::getContextInfo(GLContextType ty if (!glInterface) { return nullptr; } - } else { - if (!glInterface->hasExtension("GL_NV_path_rendering")) { - return nullptr; - } } glCtx->makeCurrent(); @@ -96,22 +92,9 @@ GrContextFactory::ContextInfo* GrContextFactory::getContextInfo(GLContextType ty if (!grCtx.get()) { return nullptr; } - // Warn if path rendering support is not available for the NVPR type. if (kNVPR_GLContextType == type) { if (!grCtx->caps()->shaderCaps()->pathRenderingSupport()) { - GrGpu* gpu = grCtx->getGpu(); - const GrGLContext* ctx = gpu->glContextForTesting(); - if (ctx) { - const GrGLubyte* verUByte; - GR_GL_CALL_RET(ctx->interface(), verUByte, GetString(GR_GL_VERSION)); - const char* ver = reinterpret_cast<const char*>(verUByte); - SkDebugf("\nWARNING: nvprmsaa config requested, but driver path rendering " - "support not available. Maybe update the driver? Your driver version " - "string: \"%s\"\n", ver); - } else { - SkDebugf("\nWARNING: nvprmsaa config requested, but driver path rendering " - "support not available.\n"); - } + return nullptr; } } |