gyp/gpu.gypi - Issue 1434313002: Make all GrFragmentProcessors GL independent.

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 1434313002: Make all GrFragmentProcessors GL independent. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 1 month 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

Index: gyp/gpu.gypi

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

index 960e857a48b082347579829ad3d96586bbfed2b7..9fa159167cc02c0ed43191174cfd3364593ecbc6 100644

--- a/gyp/gpu.gypi

+++ b/gyp/gpu.gypi

@@ -288,8 +288,6 @@

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

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

- '<(skia_src_path)/gpu/gl/GrGLSLBlend.cpp',

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

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

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

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

@@ -307,8 +305,6 @@

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

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

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

- '<(skia_src_path)/gpu/gl/GrGLFragmentProcessor.cpp',

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

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

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

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

@@ -359,8 +355,12 @@

'<(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/GrGLSLBlend.cpp',

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

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

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

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

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

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

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

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

@@ -373,6 +373,8 @@

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

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

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

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

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

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

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

« no previous file with comments | « gm/dcshader.cpp ('k') | include/gpu/GrFragmentProcessor.h » ('j') | no next file with comments »