From 3d6801eeee6b036de9f8d09e2ae8fa99df5a397c Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 11 Dec 2017 10:06:31 -0500 Subject: Add GrGLMakeNativeInterface factory that returns sk_sp. Removes the concept of a configurable "default" interface and makes the default always be the "native" interface. Also removes unused functions: GrGLInterfaceAddTestDebugMarker and GrGLInterface::NewClone. Keeps around legacy GrGLCreateNativeInterface() until clients can be weened. Change-Id: I4a3bdafa8cf8c68ed13318393abd55686b045ccb Reviewed-on: https://skia-review.googlesource.com/83000 Reviewed-by: Robert Phillips Commit-Queue: Brian Salomon --- tools/sk_app/android/GLWindowContext_android.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/sk_app/android') diff --git a/tools/sk_app/android/GLWindowContext_android.cpp b/tools/sk_app/android/GLWindowContext_android.cpp index 944865909b..acdb587230 100644 --- a/tools/sk_app/android/GLWindowContext_android.cpp +++ b/tools/sk_app/android/GLWindowContext_android.cpp @@ -121,7 +121,7 @@ sk_sp GLWindowContext_android::onInitializeContext() { SkASSERT(EGL_NO_SURFACE != fSurfaceAndroid); SkAssertResult(eglMakeCurrent(fDisplay, fSurfaceAndroid, fSurfaceAndroid, fEGLContext)); - // GLWindowContext::initializeContext will call GrGLCreateNativeInterface so we + // GLWindowContext::initializeContext will call GrGLMakeNativeInterface so we // won't call it here. glClearStencil(0); @@ -132,7 +132,7 @@ sk_sp GLWindowContext_android::onInitializeContext() { eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_STENCIL_SIZE, &fStencilBits); eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_SAMPLES, &fSampleCount); - return sk_sp(GrGLCreateNativeInterface()); + return GrGLMakeNativeInterface(); } void GLWindowContext_android::onDestroyContext() { -- cgit v1.2.3