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

Unified Diff: gyp/gpu.gypi

Issue 635533005: Revert of Cleanup of shader building system (Closed) Base URL: https://skia.googlesource.com/skia.git@solo_gp
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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/gpu/GrPaint.h » ('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 eb520b524095df66b6c34e400a61db299d3cf70a..074c932506f229671a764f697ee10696c96bdcc3 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -232,6 +232,8 @@
'<(skia_src_path)/gpu/gl/GrGLProgram.h',
'<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp',
'<(skia_src_path)/gpu/gl/GrGLProgramDesc.h',
+ '<(skia_src_path)/gpu/gl/GrGLProgramEffects.cpp',
+ '<(skia_src_path)/gpu/gl/GrGLProgramEffects.h',
'<(skia_src_path)/gpu/gl/GrGLProgramDataManager.cpp',
'<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h',
'<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp',
@@ -256,17 +258,17 @@
'<(skia_src_path)/gpu/gl/GrGpuGL_program.cpp',
# Files for building GLSL shaders
- '<(skia_src_path)/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp',
- '<(skia_src_path)/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h',
- '<(skia_src_path)/gpu/gl/builders/GrGLNvprProgramBuilder.cpp',
- '<(skia_src_path)/gpu/gl/builders/GrGLNvprProgramBuilder.h',
+ '<(skia_src_path)/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
+ '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.cpp',
+ '<(skia_src_path)/gpu/gl/builders/GrGLShaderBuilder.h',
+ '<(skia_src_path)/gpu/gl/builders/GrGLFragmentOnlyProgramBuilder.cpp',
+ '<(skia_src_path)/gpu/gl/builders/GrGLFragmentOnlyProgramBuilder.h',
+ '<(skia_src_path)/gpu/gl/builders/GrGLFullProgramBuilder.cpp',
+ '<(skia_src_path)/gpu/gl/builders/GrGLFullProgramBuilder.h',
'<(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',
« no previous file with comments | « no previous file | include/gpu/GrPaint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698