AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skiaserve no longer crashes when no X server is present

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2059263002

Review-Url: https://codereview.chromium.org/2059263002
This commit is contained in:
ethannicholas 2016-06-13 10:20:52 -07:00 committed by Commit bot
parent 76963e7370
commit 2ec06c9b1c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/skiaserve/Request.cpp
View File

@ -71,8 +71,14 @@ SkCanvas* Request::getCanvas() {
#if SK_SUPPORT_GPU #if SK_SUPPORT_GPU
GrContextFactory* factory = fContextFactory; GrContextFactory* factory = fContextFactory;
GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType, GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType,
GrContextFactory::kNone_ContextOptions).glContext(); GrContextFactory::kNone_ContextOptions).glContext();
gl->makeCurrent(); if (!gl) {
gl = factory->getContextInfo(GrContextFactory::kMESA_ContextType,
GrContextFactory::kNone_ContextOptions).glContext();
}
if (gl) {
gl->makeCurrent();
}
#endif #endif
SkASSERT(fDebugCanvas); SkASSERT(fDebugCanvas);
@ -115,10 +121,15 @@ SkData* Request::writeOutSkp() {
GrContext* Request::getContext() { GrContext* Request::getContext() {
#if SK_SUPPORT_GPU #if SK_SUPPORT_GPU
return fContextFactory->get(GrContextFactory::kNativeGL_ContextType, GrContext* result = fContextFactory->get(GrContextFactory::kNativeGL_ContextType,
GrContextFactory::kNone_ContextOptions); GrContextFactory::kNone_ContextOptions);
if (!result) {
result = fContextFactory->get(GrContextFactory::kMESA_ContextType,
GrContextFactory::kNone_ContextOptions);
}
return result;
#else #else
return nullptr; return nullptr;
#endif #endif
} }