Remove unique_ptr_address_as_pointer_address
std::unique_ptr is not always the same size as a pointer (shame! shame!).
AFAICT I added this terrible hack just to be able to make GrProcessorSet
store unique_ptrs of const GrFP rather than non-const FP, which is in no
way important.
Bug: skia:9908
Change-Id: I6e7eb0c0a7ad3473489e549909fa0b0a9eeec49b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270938
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index 907cbf7..77de66b 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -295,7 +295,7 @@
}
std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::RunInSeries(
- std::unique_ptr<GrFragmentProcessor>* series, int cnt) {
+ std::unique_ptr<GrFragmentProcessor> series[], int cnt) {
class SeriesFragmentProcessor : public GrFragmentProcessor {
public:
static std::unique_ptr<GrFragmentProcessor> Make(
@@ -372,8 +372,7 @@
// Run the through the series, do the invariant output processing, and look for eliminations.
GrProcessorAnalysisColor inputColor;
inputColor.setToUnknown();
- GrColorFragmentProcessorAnalysis info(inputColor, unique_ptr_address_as_pointer_address(series),
- cnt);
+ GrColorFragmentProcessorAnalysis info(inputColor, series, cnt);
SkTArray<std::unique_ptr<GrFragmentProcessor>> replacementSeries;
SkPMColor4f knownColor;
int leadingFPsToEliminate = info.initialProcessorsToEliminate(&knownColor);