Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: src/gpu/GrContextFactory.cpp

Issue 1235283004: Various GL testing fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/imagefromyuvtextures.cpp ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrContextFactory.cpp
diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp
index f56e535b0e5587a891d04992bb69fb7e9976c301..1924ee6f5202d3b2b0cf4a587231da7a83919e77 100755
--- a/src/gpu/GrContextFactory.cpp
+++ b/src/gpu/GrContextFactory.cpp
@@ -83,12 +83,19 @@ GrContext* GrContextFactory::get(GLContextType type, GrGLStandard forcedGpuAPI)
// Warn if path rendering support is not available for the NVPR type.
if (kNVPR_GLContextType == type) {
if (!grCtx->caps()->shaderCaps()->pathRenderingSupport()) {
- GrGLGpu* gpu = static_cast<GrGLGpu*>(grCtx->getGpu());
- const GrGLubyte* verUByte;
- GR_GL_CALL_RET(gpu->glInterface(), 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);
+ 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");
+ }
}
}
« no previous file with comments | « gm/imagefromyuvtextures.cpp ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698