Remove GrGLCreateNativeInterface

Bug: skia:13087
Change-Id: Ibaf7b223631a7282393cb670779a0a769bd0f86a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526301
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

RELEASE_NOTES.txt

@@ -5,6 +5,7 @@ This file includes a list of high level updates for each milestone release.
 Milestone 102
 -------------
   * Add glGetFloatv and glSamplerParameterf to GrGLInterface.
+  * GrGLCreateNativeInterface is removed. Use GrGLMakeNativeInterface.
 
 * * *
 

include/gpu/gl/GrGLInterface.h

@@ -31,8 +31,6 @@ struct GrGLInterface;
  * appropriate one to build.
  */
 SK_API sk_sp<const GrGLInterface> GrGLMakeNativeInterface();
-// Deprecated alternative to GrGLMakeNativeInterface().
-SK_API const GrGLInterface* GrGLCreateNativeInterface();
 
 /**
  * GrContext uses the following interface to make all calls into OpenGL. When a

src/gpu/gl/GrGLGpu.cpp

@@ -344,11 +344,6 @@ sk_sp<GrGpu> GrGLGpu::Make(sk_sp<const GrGLInterface> interface, const GrContext
                            GrDirectContext* direct) {
     if (!interface) {
         interface = GrGLMakeNativeInterface();
-        // For clients that have written their own GrGLCreateNativeInterface and haven't yet updated
-        // to GrGLMakeNativeInterface.
-        if (!interface) {
-            interface = sk_ref_sp(GrGLCreateNativeInterface());
-        }
         if (!interface) {
             return nullptr;
         }

src/gpu/gl/GrGLMakeNativeInterface_none.cpp

@@ -8,5 +8,3 @@
 #include "include/gpu/gl/GrGLInterface.h"
 
 sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return nullptr; }
-
-const GrGLInterface* GrGLCreateNativeInterface() { return nullptr; }

src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp

@@ -9,5 +9,3 @@
 #include "include/gpu/gl/egl/GrGLMakeEGLInterface.h"
 
 sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return GrGLMakeEGLInterface(); }
-
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }

src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw.cpp

@@ -25,5 +25,3 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() {
 
     return GrGLMakeAssembledInterface(nullptr, glfw_get);
 }
-
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }

src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp

@@ -9,5 +9,3 @@
 #include "include/gpu/gl/glx/GrGLMakeGLXInterface.h"
 
 sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return GrGLMakeGLXInterface(); }
-
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }

src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp

@@ -23,6 +23,4 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() {
             return (GrGLFuncPtr)dlsym(ctx ? ctx : RTLD_DEFAULT, name); });
 }
 
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }
-
 #endif  // SK_BUILD_FOR_IOS

src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp

@@ -23,6 +23,4 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() {
             return (GrGLFuncPtr)dlsym(ctx ? ctx : RTLD_DEFAULT, name); });
 }
 
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }
-
 #endif  // SK_BUILD_FOR_MAC

src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp

@@ -31,5 +31,3 @@ static GrGLFuncPtr webgl_get_gl_proc(void* ctx, const char name[]) {
 sk_sp<const GrGLInterface> GrGLMakeNativeInterface() {
     return GrGLMakeAssembledInterface(nullptr, webgl_get_gl_proc);
 }
-
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }

src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp

@@ -66,6 +66,4 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() {
 
 #endif // ARM64
 
-const GrGLInterface* GrGLCreateNativeInterface() { return GrGLMakeNativeInterface().release(); }
-
 #endif//defined(SK_BUILD_FOR_WIN)

tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm

@@ -58,7 +58,7 @@ IOSGLTestContext::IOSGLTestContext(IOSGLTestContext* shareContext)
     SkScopeExit restorer(context_restorer());
     [EAGLContext setCurrentContext:fEAGLContext.get()];
 
-    sk_sp<const GrGLInterface> gl(GrGLCreateNativeInterface());
+    sk_sp<const GrGLInterface> gl = GrGLMakeNativeInterface();
     if (nullptr == gl.get()) {
         SkDebugf("Failed to create gl interface");
         this->destroyGLContext();