gyp/gpu.gypi - Issue 639793002: Revert of Make the Sk GL context class an abstract base class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/gpu.gypi

Issue 639793002: Revert of Make the Sk GL context class an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: 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:

Index: gyp/gpu.gypi

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi

index 1a7a4252768a40e48ef163cc513e6896739c7f62..551e4a15ded46711a279dfcbf7489e61947cac6b 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/SkGLContext.h',

+ '<(skia_include_path)/gpu/gl/SkGLContextHelper.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/SkGLContext.cpp'

+ '<(skia_src_path)/gpu/gl/SkGLContextHelper.cpp'

'skgpu_native_gl_sources': [

'<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp',

@@ -302,12 +302,13 @@

'<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',

# Sk files

- '<(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',

+ '<(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',

'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 »