diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 18:02:06 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-09 18:02:06 +0000 |
| commit | 1a8940e558ecc91502767525f69339fd45b71bd4 (patch) | |
| tree | 49eae5d97f1d8ed4bf2912231b743afce7b85de4 /gyp | |
| parent | 25fc6b9bfb3f9c2839b463b69b86ce9ed206c763 (diff) | |
Revert "More general image filter interface; tested implementation of standalone"
This reverts commit 4df3e8b079e019af5f60c13e7e6ec6589663962a.
git-svn-id: http://skia.googlecode.com/svn/trunk@9937 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gypi | 1 | ||||
| -rw-r--r-- | gyp/core.gypi | 3 | ||||
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/opts.gyp | 4 |
4 files changed, 2 insertions, 7 deletions
diff --git a/gyp/bench.gypi b/gyp/bench.gypi index 956fec9d83..37e65526a7 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -5,6 +5,7 @@ '../bench/benchmain.cpp', '../bench/SkBenchmark.h', '../bench/SkBenchmark.cpp', + '../bench/AAClipBench.cpp', '../bench/BicubicBench.cpp', '../bench/BitmapBench.cpp', diff --git a/gyp/core.gypi b/gyp/core.gypi index e87c0f4a0e..270323150c 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -21,14 +21,13 @@ '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', - '<(skia_src_path)/core/SkBitmapFilter.h', - '<(skia_src_path)/core/SkBitmapFilter.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', '<(skia_src_path)/core/SkBitmapHeap.h', '<(skia_src_path)/core/SkBitmapProcShader.cpp', '<(skia_src_path)/core/SkBitmapProcShader.h', '<(skia_src_path)/core/SkBitmapProcState.cpp', '<(skia_src_path)/core/SkBitmapProcState.h', + '<(skia_src_path)/core/SkBitmapProcBicubic.cpp', '<(skia_src_path)/core/SkBitmapProcState_matrix.h', '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp', '<(skia_src_path)/core/SkBitmapProcState_sample.h', diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 0b640a2e2b..66f869f4f8 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -89,7 +89,6 @@ '../gm/rrects.cpp', '../gm/roundrects.cpp', '../gm/samplerstress.cpp', - # '../gm/scalebitmap.cpp', '../gm/shaderbounds.cpp', '../gm/selftest.cpp', '../gm/shadertext.cpp', diff --git a/gyp/opts.gyp b/gyp/opts.gyp index bcc85a9bae..2c87b81fc1 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -43,13 +43,9 @@ ], }], ], - 'include_dirs': [ - '../include/utils', - ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', - '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', |