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 --- public.bzl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'public.bzl') 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", -- cgit v1.2.3