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

Fiddle: update to new GrGLAssembleInterface API

Browse Source 
NOTRY=true
TBR=

Review URL: https://codereview.chromium.org/1849753003
This commit is contained in:
halcanary 2016-03-31 10:35:13 -07:00 committed by Commit bot
parent ca9206e10f
commit a5598a40f8
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
experimental/fiddle/fiddle_main.cpp
View File

@ -72,13 +72,24 @@ static OSMesaContext create_osmesa_context() {
return osMesaContext;
}
static GrContext* create_mesa_grcontext() {
sk_sp<const GrGLInterface> mesa(GrGLCreateMesaInterface());
intptr_t backend = reinterpret_cast<intptr_t>(mesa.get());
return backend ? GrContext::Create(kOpenGL_GrBackend, backend) : nullptr;
static sk_sp<GrContext> create_mesa_grcontext() {
if (nullptr == OSMesaGetCurrentContext()) {
return nullptr;
}
auto osmesa_get = [](void* ctx, const char name[]) {
SkASSERT(nullptr == ctx);
SkASSERT(OSMesaGetCurrentContext());
return OSMesaGetProcAddress(name);
};
sk_sp<const GrGLInterface> mesa(GrGLAssembleInterface(nullptr, osmesa_get));
if (!mesa) {
return nullptr;
}
return sk_sp<GrContext>(GrContext::Create(
kOpenGL_GrBackend,
reinterpret_cast<intptr_t>(mesa.get())));
}
int main() {
const DrawOptions options = GetDrawOptions();
if (options.source) {
@ -105,7 +116,7 @@ int main() {
}
if (options.gpu) {
OSMesaContext osMesaContext = create_osmesa_context();
sk_sp<GrContext> grContext(create_mesa_grcontext());
auto grContext = create_mesa_grcontext();
if (!grContext) {
fputs("Unable to get Mesa GrContext.\n", stderr);
} else {