diff options
| author | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-10 12:13:36 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-10 12:13:36 +0000 |
| commit | d8f856c32b679d9f5a9926feac005e2c0186f83f (patch) | |
| tree | 9a5c91574e05899e7a6abe3df5ce591acf898d9b /gyp | |
| parent | 96a162eb71a9613ebadf8689128a6b2f50fe8f0d (diff) | |
| download | skia-d8f856c32b679d9f5a9926feac005e2c0186f83f.tar.gz | |
Move convolution from code in GrGLProgram to new GrConvolutionEffect
class. This is the first test of the new Ganesh shader pipeline.
Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing
us to remove ../ from many #include directives.
http://codereview.appspot.com/6199053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 1db7f806bd..b30e5cfd2e 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -164,6 +164,7 @@ '../include/config', '../include/gpu', '../src/core', # SkRasterClip.h + '../src/gpu' ], 'dependencies': [ 'libtess.gyp:libtess', @@ -248,6 +249,8 @@ '../src/gpu/GrPathUtils.cpp', '../src/gpu/GrPathUtils.h', '../src/gpu/GrPlotMgr.h', + '../src/gpu/GrProgramStageFactory.cpp', + '../src/gpu/GrProgramStageFactory.h', '../src/gpu/GrRandom.h', '../src/gpu/GrRectanizer.cpp', '../src/gpu/GrRectanizer.h', @@ -276,6 +279,9 @@ '../src/gpu/GrVertexBuffer.h', '../src/gpu/gr_unittests.cpp', + '../src/gpu/effects/GrConvolutionEffect.cpp', + '../src/gpu/effects/GrConvolutionEffect.h', + '../src/gpu/gl/GrGLCaps.cpp', '../src/gpu/gl/GrGLCaps.h', '../src/gpu/gl/GrGLContextInfo.cpp', |