0ce3d43df9
We only support MSAA with RGBA (not BGRA), on ANGLE, so we were failing to construct the GPU surface. Instead, use the original canvas' info to make the image surface (but always use N32 to make the raster surface). I think this will fix the Ubuntu Intel glesmsaa4 crashes, too, although I don't have a machine to test on right now. Bug: skia:6457 skia:6401 Change-Id: Icfc47845e97ef0806fb6d875f454d3920020ffbd Reviewed-on: https://skia-review.googlesource.com/19054 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
/*
|
|
* Copyright 2015 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 "SkSurface.h"
|
|
|
|
class Image2RasterBench : public Benchmark {
|
|
public:
|
|
Image2RasterBench() {
|
|
fName.set("native_image_to_raster_surface");
|
|
}
|
|
|
|
bool isSuitableFor(Backend backend) override {
|
|
return kGPU_Backend == backend || kRaster_Backend == backend;
|
|
}
|
|
|
|
protected:
|
|
const char* onGetName() override {
|
|
return fName.c_str();
|
|
}
|
|
|
|
// We explicitly want to bench drawing a Image [cpu or gpu backed] into a raster target,
|
|
// to ensure that we can cache the read-back in the case of gpu -> raster
|
|
//
|
|
void onPerCanvasPreDraw(SkCanvas* canvas) override {
|
|
// create an Image reflecting the canvas (gpu or cpu)
|
|
SkImageInfo info = canvas->imageInfo().makeWH(100, 100);
|
|
auto surface(canvas->makeSurface(info));
|
|
canvas->drawColor(SK_ColorRED);
|
|
fImage = surface->makeImageSnapshot();
|
|
|
|
// create a cpu-backed Surface
|
|
SkImageInfo n32Info = SkImageInfo::MakeN32Premul(100, 100);
|
|
fRasterSurface = SkSurface::MakeRaster(n32Info);
|
|
}
|
|
|
|
void onPerCanvasPostDraw(SkCanvas*) override {
|
|
// Release the image and raster surface here to prevent out of order destruction
|
|
// between these and the gpu interface.
|
|
fRasterSurface.reset(nullptr);
|
|
fImage.reset(nullptr);
|
|
}
|
|
|
|
void onDraw(int loops, SkCanvas*) override {
|
|
for (int i = 0; i < loops; i++) {
|
|
for (int inner = 0; inner < 10; ++inner) {
|
|
fRasterSurface->getCanvas()->drawImage(fImage.get(), 0, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
SkString fName;
|
|
sk_sp<SkImage> fImage;
|
|
sk_sp<SkSurface> fRasterSurface;
|
|
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
DEF_BENCH( return new Image2RasterBench; )
|