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 /public.bzl | |
| 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 'public.bzl')
| -rw-r--r-- | public.bzl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/public.bzl b/public.bzl index 7d2ee5d1be..e01e9da0f1 100644 --- a/public.bzl +++ b/public.bzl @@ -233,9 +233,7 @@ BASE_SRCS_ALL = struct( # 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 @@ def codec_srcs(limited): # 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 @@ BASE_SRCS_UNIX = struct( # 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 @@ BASE_SRCS_ANDROID = struct( # 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", |