gyp/gpu.gypi - Issue 1438003003: Move all ShaderBuilder files to GLSL

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 1438003003: Move all ShaderBuilder files to GLSL (Closed) Base URL: https://skia.googlesource.com/skia.git@glslProgBuild

Patch Set: nits 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 1f1b6a37fd5306df092cd869f3baaf887d837ff9..960e857a48b082347579829ad3d96586bbfed2b7 100644

--- a/gyp/gpu.gypi

+++ b/gyp/gpu.gypi

@@ -351,17 +351,9 @@

# Files for building GLSL shaders

'<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.cpp',

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

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

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

'<(skia_src_path)/gpu/gl/builders/GrGLShaderStringBuilder.cpp',

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

'<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp',

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

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

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

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

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

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

# GLSL

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

@@ -369,12 +361,20 @@

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

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

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

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

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

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

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

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

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

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

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

# Sk files

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

« no previous file with comments | « gm/dcshader.cpp ('k') | src/core/SkLightingShader.cpp » ('j') | no next file with comments »