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>
diff --git a/public.bzl b/public.bzl
index 7d2ee5d..e01e9da 100644
--- a/public.bzl
+++ b/public.bzl
@@ -233,9 +233,7 @@
# Exclude multiple definitions.
# TODO(mtklein): Move to opts?
"src/pdf/SkDocument_PDF_None.cpp", # We use src/pdf/SkPDFDocument.cpp.
- "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
- "src/gpu/gl/GrGLDefaultInterface_native.cpp",
- "src/gpu/gl/GrGLDefaultInterface_none.cpp",
+ "src/gpu/gl/GrGLMakeNativeInterface_none.cpp",
# Exclude files that don't compile with the current DEFINES.
"src/svg/**/*", # Depends on XML.
@@ -276,7 +274,6 @@
# Platform-dependent SRCS for google3-default platform.
BASE_SRCS_UNIX = struct(
include = [
- "src/gpu/gl/GrGLDefaultInterface_none.cpp",
"src/ports/**/*.cpp",
"src/ports/**/*.h",
],
@@ -304,7 +301,6 @@
# Platform-dependent SRCS for google3-default Android.
BASE_SRCS_ANDROID = struct(
include = [
- "src/gpu/gl/GrGLDefaultInterface_none.cpp",
# TODO(benjaminwagner): Figure out how to compile with EGL.
"src/ports/**/*.cpp",
"src/ports/**/*.h",
@@ -333,8 +329,7 @@
# Platform-dependent SRCS for google3-default iOS.
BASE_SRCS_IOS = struct(
include = [
- "src/gpu/gl/GrGLDefaultInterface_native.cpp",
- "src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp",
+ "src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp",
"src/ports/**/*.cpp",
"src/ports/**/*.h",
"src/utils/mac/*.cpp",