31249bb2df
This reverts commit9e9188f84b. Reason for revert: Android-side fix has landed Original change's description: > Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot" > > This reverts commitb64bcbdc3a. > > Reason for revert: > > Android build failed as shown below. > > frameworks/base/libs/hwui/VkLayer.cpp:32:41: error: too many arguments to function call, expected 0, have 1 > mImage = surface->makeImageSnapshot(SkBudgeted::kNo); > > Original change's description: > > Remove budgeted parameter from SkSurface::makeImageSnapshot > > > > This unused feature complicates MDB. > > > > Chrome compiles locally for me with this CL. > > > > Change-Id: I611e464885fb984030eace43ead42cf39d0e7f72 > > Reviewed-on: https://skia-review.googlesource.com/9734 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Robert Phillips <robertphillips@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iae6e313c15b2352bd0d4fc7b5629de0a51ac398e > Reviewed-on: https://skia-review.googlesource.com/9788 > Reviewed-by: Yuqian Li <liyuqian@google.com> > Commit-Queue: Yuqian Li <liyuqian@google.com> > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org,liyuqian@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: If07d1b5db6e6c618d37445a0cf127780ed243a92 Reviewed-on: https://skia-review.googlesource.com/9843 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
80 lines
2.3 KiB
C++
80 lines
2.3 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Benchmark.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkImage.h"
|
|
#include "SkPaint.h"
|
|
#include "SkSurface.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
class GrMipMapBench: public Benchmark {
|
|
sk_sp<SkSurface> fSurface;
|
|
SkString fName;
|
|
const int fW, fH;
|
|
|
|
public:
|
|
GrMipMapBench(int w, int h) : fW(w), fH(h) {
|
|
fName.printf("gr_mipmap_build_%dx%d", w, h);
|
|
}
|
|
|
|
protected:
|
|
bool isSuitableFor(Backend backend) override {
|
|
return kGPU_Backend == backend;
|
|
}
|
|
|
|
const char* onGetName() override { return fName.c_str(); }
|
|
|
|
void onDraw(int loops, SkCanvas* canvas) override {
|
|
if (!fSurface) {
|
|
GrContext* context = canvas->getGrContext();
|
|
if (nullptr == context) {
|
|
return;
|
|
}
|
|
auto srgb = SkColorSpace::MakeSRGB();
|
|
SkImageInfo info = SkImageInfo::Make(fW, fH, kN32_SkColorType, kPremul_SkAlphaType,
|
|
srgb);
|
|
fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
|
|
}
|
|
|
|
// Clear surface once:
|
|
fSurface->getCanvas()->clear(SK_ColorBLACK);
|
|
|
|
SkPaint paint;
|
|
paint.setFilterQuality(kMedium_SkFilterQuality);
|
|
paint.setColor(SK_ColorWHITE);
|
|
for (int i = 0; i < loops; i++) {
|
|
// Touch surface so mips are dirtied
|
|
fSurface->getCanvas()->drawPoint(0, 0, paint);
|
|
|
|
// Draw reduced version of surface to original canvas, to trigger mip generation
|
|
canvas->save();
|
|
canvas->scale(0.1f, 0.1f);
|
|
canvas->drawImage(fSurface->makeImageSnapshot(), 0, 0, &paint);
|
|
canvas->restore();
|
|
}
|
|
}
|
|
|
|
void onPerCanvasPostDraw(SkCanvas*) override {
|
|
fSurface.reset(nullptr);
|
|
}
|
|
|
|
private:
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
// Build variants that exercise the width and heights being even or odd at each level, as the
|
|
// impl specializes on each of these.
|
|
//
|
|
DEF_BENCH( return new GrMipMapBench(511, 511); )
|
|
DEF_BENCH( return new GrMipMapBench(512, 511); )
|
|
DEF_BENCH( return new GrMipMapBench(511, 512); )
|
|
DEF_BENCH( return new GrMipMapBench(512, 512); )
|
|
|
|
#endif
|