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

Unified Diff: src/effects/SkTableColorFilter.cpp

Issue 973593002: change colorfilter to return an array of frag processors (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update gm Created 5 years, 10 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
Index: src/effects/SkTableColorFilter.cpp
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index d6c3e5f03274b7e772086bcf05ed5ac349efe564..073bc188053bde9cba1001d6e0bf99cc9665a276 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -44,7 +44,7 @@ public:
SkColorFilter* newComposed(const SkColorFilter* inner) const SK_OVERRIDE;
#if SK_SUPPORT_GPU
- GrFragmentProcessor* asFragmentProcessor(GrContext* context) const SK_OVERRIDE;
+ bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE;
#endif
void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const SK_OVERRIDE;
@@ -567,14 +567,28 @@ GrFragmentProcessor* ColorTableEffect::TestCreate(SkRandom* random,
(flags & (1 << 2)) ? luts[2] : NULL,
(flags & (1 << 3)) ? luts[3] : NULL
));
- return filter->asFragmentProcessor(context);
+
+ SkTDArray<GrFragmentProcessor*> array;
+ if (filter->asFragmentProcessors(context, &array)) {
+ SkASSERT(1 == array.count()); // TableColorFilter only returns 1
+ return array[0];
+ }
+ return NULL;
}
-GrFragmentProcessor* SkTable_ColorFilter::asFragmentProcessor(GrContext* context) const {
+bool SkTable_ColorFilter::asFragmentProcessors(GrContext* context,
+ SkTDArray<GrFragmentProcessor*>* array) const {
SkBitmap bitmap;
this->asComponentTable(&bitmap);
- return ColorTableEffect::Create(context, bitmap, fFlags);
+ GrFragmentProcessor* frag = ColorTableEffect::Create(context, bitmap, fFlags);
+ if (frag) {
+ if (array) {
+ *array->append() = frag;
+ }
+ return true;
+ }
+ return false;
}
#endif // SK_SUPPORT_GPU

Powered by Google App Engine
This is Rietveld 408576698