diff options
| -rw-r--r-- | gm/pictureimagegenerator.cpp | 2 | ||||
| -rw-r--r-- | include/core/SkImageGenerator.h | 20 | ||||
| -rw-r--r-- | src/core/SkPictureImageGenerator.cpp | 3 |
3 files changed, 1 insertions, 24 deletions
diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp index c340d1f016..bf97a65305 100644 --- a/gm/pictureimagegenerator.cpp +++ b/gm/pictureimagegenerator.cpp @@ -156,7 +156,7 @@ protected: SkImageGenerator::NewFromPicture(configs[i].size, fPicture.get(), &m, p.getAlpha() != 255 ? &p : nullptr)); SkBitmap bm; - gen->generateBitmap(&bm); + gen->generateBitmap(&bm, SkImageInfo::MakeN32Premul(configs[i].size)); const SkScalar x = kDrawSize * (i % kDrawsPerRow); const SkScalar y = kDrawSize * (i / kDrawsPerRow); diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h index c19cbb4fa7..e775d9e02c 100644 --- a/include/core/SkImageGenerator.h +++ b/include/core/SkImageGenerator.h @@ -124,15 +124,6 @@ public: bool getYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3]); /** - * Returns true if the generate can efficiently return a texture (given the properties of the - * proxy). By default, simple codecs will usually return false, since they must be decoded - * on the CPU and then uploaded to become a texture. - */ - bool canGenerateTexture(const GrContextThreadSafeProxy& proxy) { - return this->onCanGenerateTexture(proxy); - } - - /** * If the generator can natively/efficiently return its pixels as a GPU image (backed by a * texture) this will return that image. If not, this will return NULL. * @@ -250,17 +241,9 @@ public: static SkImageGenerator* NewFromPicture(const SkISize&, const SkPicture*, const SkMatrix*, const SkPaint*); - bool tryGenerateBitmap(SkBitmap* bm) { - return this->tryGenerateBitmap(bm, nullptr, nullptr); - } bool tryGenerateBitmap(SkBitmap* bm, const SkImageInfo& info, SkBitmap::Allocator* allocator) { return this->tryGenerateBitmap(bm, &info, allocator); } - void generateBitmap(SkBitmap* bm) { - if (!this->tryGenerateBitmap(bm, nullptr, nullptr)) { - sk_throw(); - } - } void generateBitmap(SkBitmap* bm, const SkImageInfo& info) { if (!this->tryGenerateBitmap(bm, &info, nullptr)) { sk_throw(); @@ -286,9 +269,6 @@ protected: return false; } - virtual bool onCanGenerateTexture(const GrContextThreadSafeProxy&) { - return false; - } virtual GrTexture* onGenerateTexture(GrContext*, const SkIRect*) { return nullptr; } diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index 22baf53be7..b15fadd818 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -26,9 +26,6 @@ protected: bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) override; #if SK_SUPPORT_GPU - bool onCanGenerateTexture(const GrContextThreadSafeProxy&) override { - return true; - } GrTexture* onGenerateTexture(GrContext*, const SkIRect*) override; #endif |