09c9400695
This reverts commit01422bc8ef. Reason for revert: follow on change may be ready Original change's description: > Revert "Reland "Require mips to be allocated at texture creation time and disable late allocations."" > > This reverts commit9eb36b9eb8. > > Reason for revert: Alpha8 isn't renderable on es2 so we end up dropping draws on certain A8 mip requests > > Original change's description: > > Reland "Require mips to be allocated at texture creation time and disable late allocations." > > > > This reverts commit0c78238e29. > > > > Reason for revert: <INSERT REASONING HERE> > > > > Original change's description: > > > Revert "Require mips to be allocated at texture creation time and disable late allocations." > > > > > > This reverts commitcd2c3f9055. > > > > > > Reason for revert: Looks to be causing angle failures on initial clear test > > > > > > Original change's description: > > > > Require mips to be allocated at texture creation time and disable late allocations. > > > > > > > > If we get a non-mipped texture for a draw that wants to be use mip map filter, we > > > > will copy the texture into a new mipped texture. > > > > > > > > Clean up of unused code in the GPU backends for reallocating for mips will be done > > > > in a follow up CL. > > > > > > > > Bug: skia: > > > > Change-Id: Idab588c1abf4bbbf7eeceb3727d500e5df274188 > > > > Reviewed-on: https://skia-review.googlesource.com/132830 > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > > > > > > > Change-Id: I49f0ace52f2586d61b451630b2e6aae84b420b81 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia: > > > Reviewed-on: https://skia-review.googlesource.com/133041 > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > Bug: skia: > > Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4 > > Reviewed-on: https://skia-review.googlesource.com/133340 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I9e9718d380c4d9927ec39e46008750ab7396391f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/133680 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Ic3df69f65a89962b21cdb50ee436a29fd121ab1f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/133740 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
80 lines
2.5 KiB
C++
80 lines
2.5 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"
|
|
|
|
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, kRGBA_8888_SkColorType, kPremul_SkAlphaType, srgb);
|
|
// We're benching the regeneration of the mip levels not the need to allocate them every
|
|
// frame. Thus we create the surface with mips to begin with.
|
|
fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info, 0,
|
|
kBottomLeft_GrSurfaceOrigin, nullptr, true);
|
|
|
|
}
|
|
|
|
// 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); )
|