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 /gn/gpu.gni | |
| 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 'gn/gpu.gni')
| -rw-r--r-- | gn/gpu.gni | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index a16a9f91c8..d1cc8ba88d 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -407,9 +407,8 @@ skia_gpu_sources = [ "$_src/gpu/gl/GrGLCaps.h", "$_src/gpu/gl/GrGLContext.cpp", "$_src/gpu/gl/GrGLContext.h", - "$_src/gpu/gl/GrGLCreateNativeInterface_none.cpp", + "$_src/gpu/gl/GrGLMakeNativeInterface_none.cpp", "$_src/gpu/gl/GrGLCreateNullInterface.cpp", - "$_src/gpu/gl/GrGLDefaultInterface_none.cpp", "$_src/gpu/gl/GrGLDefines.h", "$_src/gpu/gl/GrGLGLSL.cpp", "$_src/gpu/gl/GrGLGLSL.h", @@ -611,13 +610,12 @@ skia_metal_sources = [ ] skia_native_gpu_sources = [ - "$_src/gpu/gl/GrGLDefaultInterface_native.cpp", - "$_src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp", - "$_src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp", - "$_src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp", - "$_src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp", - "$_src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp", - "$_src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp", + "$_src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp", + "$_src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp", + "$_src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp", + "$_src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "$_src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", + "$_src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp", ] skia_atlas_text_sources = [ |