diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-12-11 10:06:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-11 17:54:38 +0000 |
| commit | 3d6801eeee6b036de9f8d09e2ae8fa99df5a397c (patch) | |
| tree | cbdcd23fe4924fbe25afae209d01bb6527244abf /tools/sk_app/android | |
| parent | d67e5189802e89e74217244b36cc7263883d5dba (diff) | |
Add GrGLMakeNativeInterface factory that returns sk_sp<const GrGLInterface>.
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 <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/sk_app/android')
| -rw-r--r-- | tools/sk_app/android/GLWindowContext_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<const GrGLInterface> 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<const GrGLInterface> GLWindowContext_android::onInitializeContext() { eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_STENCIL_SIZE, &fStencilBits); eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_SAMPLES, &fSampleCount); - return sk_sp<const GrGLInterface>(GrGLCreateNativeInterface()); + return GrGLMakeNativeInterface(); } void GLWindowContext_android::onDestroyContext() { |