diff options
author | Robert Phillips <robertphillips@google.com> | 2018-03-15 08:01:22 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-15 12:55:06 +0000 |
commit | 38eb740b945626d45bcd44a9fd69573955205b68 (patch) | |
tree | a4b99fdd2b3f2663bd579799228400a12b3a5507 /include | |
parent | 0fe4ed8598e76c7813adfeee2242b0564b06a3f2 (diff) |
Remove SK_RASTER_RECORDER_IMPLEMENTATION
TBR=bsalomon@google.com
Change-Id: I9608ce5ce2b9d38c5e356d8428a8ff05df6ccda7
Reviewed-on: https://skia-review.googlesource.com/114490
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkDeferredDisplayListRecorder.h | 2 | ||||
-rw-r--r-- | include/core/SkSurfaceCharacterization.h | 4 | ||||
-rw-r--r-- | include/private/SkDeferredDisplayList.h | 20 |
3 files changed, 0 insertions, 26 deletions
diff --git a/include/core/SkDeferredDisplayListRecorder.h b/include/core/SkDeferredDisplayListRecorder.h index 497bb65248..048ce2b050 100644 --- a/include/core/SkDeferredDisplayListRecorder.h +++ b/include/core/SkDeferredDisplayListRecorder.h @@ -111,12 +111,10 @@ private: const SkSurfaceCharacterization fCharacterization; -#ifndef SK_RASTER_RECORDER_IMPLEMENTATION #if SK_SUPPORT_GPU sk_sp<GrContext> fContext; #endif sk_sp<SkDeferredDisplayList::LazyProxyData> fLazyProxyData; -#endif sk_sp<SkSurface> fSurface; }; diff --git a/include/core/SkSurfaceCharacterization.h b/include/core/SkSurfaceCharacterization.h index 9888c59164..8a2c4587ed 100644 --- a/include/core/SkSurfaceCharacterization.h +++ b/include/core/SkSurfaceCharacterization.h @@ -16,10 +16,6 @@ class SkColorSpace; -// This define can be used to swap between the default (raster) DDL implementation and the -// gpu implementation. -//#define SK_RASTER_RECORDER_IMPLEMENTATION 1 - #if SK_SUPPORT_GPU #include "GrContext.h" diff --git a/include/private/SkDeferredDisplayList.h b/include/private/SkDeferredDisplayList.h index a3517bb6a0..4d379636a9 100644 --- a/include/private/SkDeferredDisplayList.h +++ b/include/private/SkDeferredDisplayList.h @@ -14,10 +14,6 @@ #include "GrOpList.h" #endif -#ifdef SK_RASTER_RECORDER_IMPLEMENTATION -class SkImage; // DDL TODO: rm this since it is just for the temporary placeholder implementation -#endif - class SkSurface; /* @@ -29,16 +25,6 @@ class SkSurface; class SkDeferredDisplayList { public: -#ifdef SK_RASTER_RECORDER_IMPLEMENTATION - SkDeferredDisplayList(const SkSurfaceCharacterization& characterization, sk_sp<SkImage> image) - : fCharacterization(characterization) - , fImage(std::move(image)) { - } - - // DDL TODO: remove this. It is just scaffolding to get something up & running - bool draw(SkSurface*) const; -#endif - #if SK_SUPPORT_GPU // This object is the source from which the lazy proxy backing the DDL will pull its backing // texture when the DDL is replayed. It has to be separately ref counted bc the lazy proxy @@ -67,16 +53,10 @@ private: const SkSurfaceCharacterization fCharacterization; -#ifdef SK_RASTER_RECORDER_IMPLEMENTATION - sk_sp<SkImage> fImage; -#else - #if SK_SUPPORT_GPU SkTArray<sk_sp<GrOpList>> fOpLists; #endif sk_sp<LazyProxyData> fLazyProxyData; - -#endif }; #endif |