gyp/gpu.gypi - Issue 1417123002: Move GrGLShaderVar to GrGLSL

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 1417123002: Move GrGLShaderVar to GrGLSL (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix gyp Created 5 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 9212775fa5fc0cec29448eb4951c2c7b4c8570cc..d1c835009b9f79ef6a7ad750f0192290ca4fb900 100644

--- a/gyp/gpu.gypi

+++ b/gyp/gpu.gypi

@@ -332,7 +332,6 @@

'<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h',

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

'<(skia_src_path)/gpu/gl/GrGLRenderTarget.h',

- '<(skia_src_path)/gpu/gl/GrGLShaderVar.h',

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

'<(skia_src_path)/gpu/gl/GrGLStencilAttachment.h',

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

@@ -364,11 +363,12 @@

'<(skia_src_path)/gpu/gl/builders/GrGLGeometryShaderBuilder.h',

# GLSL

- '<(skia_src_path)/gpu/glsl/GrGLSLCaps.cpp',

- '<(skia_src_path)/gpu/glsl/GrGLSLCaps.h',

'<(skia_src_path)/gpu/glsl/GrGLSL.cpp',

'<(skia_src_path)/gpu/glsl/GrGLSL.h',

'<(skia_src_path)/gpu/glsl/GrGLSL_impl.h',

+ '<(skia_src_path)/gpu/glsl/GrGLSLCaps.cpp',

+ '<(skia_src_path)/gpu/glsl/GrGLSLCaps.h',

+ '<(skia_src_path)/gpu/glsl/GrGLSLShaderVar.h',

# Sk files

'<(skia_include_path)/gpu/SkGr.h',

« no previous file with comments | « bench/GLVertexAttributesBench.cpp ('k') | src/effects/SkBlurMaskFilter.cpp » ('j') | no next file with comments »