Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: gyp/gpu.gypi

Issue 630843002: Make the Sk GL context class an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix android link problem and ios compile problem Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/nanobench.cpp ('k') | gyp/public_headers.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 551e4a15ded46711a279dfcbf7489e61947cac6b..1a7a4252768a40e48ef163cc513e6896739c7f62 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -279,7 +279,7 @@
'<(skia_include_path)/gpu/SkGrPixelRef.h',
'<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
- '<(skia_include_path)/gpu/gl/SkGLContextHelper.h',
+ '<(skia_include_path)/gpu/gl/SkGLContext.h',
'<(skia_src_path)/gpu/SkGpuDevice.cpp',
'<(skia_src_path)/gpu/SkGpuDevice.h',
@@ -290,7 +290,7 @@
'<(skia_src_path)/image/SkImage_Gpu.cpp',
'<(skia_src_path)/image/SkSurface_Gpu.cpp',
- '<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp'
+ '<(skia_src_path)/gpu/gl/SkGLContext.cpp'
],
'skgpu_native_gl_sources': [
'<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp',
@@ -302,13 +302,12 @@
'<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
# Sk files
- '<(skia_include_path)/gpu/gl/SkNativeGLContext.h',
- '<(skia_src_path)/gpu/gl/mac/SkNativeGLContext_mac.cpp',
- '<(skia_src_path)/gpu/gl/nacl/SkNativeGLContext_nacl.cpp',
- '<(skia_src_path)/gpu/gl/win/SkNativeGLContext_win.cpp',
- '<(skia_src_path)/gpu/gl/glx/SkNativeGLContext_glx.cpp',
- '<(skia_src_path)/gpu/gl/egl/SkNativeGLContext_egl.cpp',
- '<(skia_src_path)/gpu/gl/iOS/SkNativeGLContext_iOS.mm',
+ '<(skia_src_path)/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp',
+ '<(skia_src_path)/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
+ '<(skia_src_path)/gpu/gl/win/SkCreatePlatformGLContext_win.cpp',
+ '<(skia_src_path)/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
+ '<(skia_src_path)/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp',
+ '<(skia_src_path)/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm',
],
'skgpu_mesa_gl_sources': [
'<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
« no previous file with comments | « bench/nanobench.cpp ('k') | gyp/public_headers.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698