| Index: src/gpu/SkGr.cpp
|
| diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
|
| index 3c3f3e8fab99e9836564c571d912003901991c2e..1ffd2560269255f995ad7cda52c54205e2b36cce 100644
|
| --- a/src/gpu/SkGr.cpp
|
| +++ b/src/gpu/SkGr.cpp
|
| @@ -217,11 +217,6 @@ static GrTexture* load_etc1_texture(GrContext* ctx, const SkBitmap &bm, GrSurfac
|
| GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bmp) {
|
| SkASSERT(!bmp.getTexture());
|
|
|
| - if (bmp.width() < ctx->caps()->minTextureSize() ||
|
| - bmp.height() < ctx->caps()->minTextureSize()) {
|
| - return nullptr;
|
| - }
|
| -
|
| SkBitmap tmpBitmap;
|
| const SkBitmap* bitmap = &bmp;
|
|
|
| @@ -291,8 +286,6 @@ public:
|
| }
|
|
|
| protected:
|
| - GrTexture* peekOriginalTexture() override { return fBitmap.getTexture(); }
|
| -
|
| GrTexture* refOriginalTexture(GrContext* ctx) override {
|
| GrTexture* tex = fBitmap.getTexture();
|
| if (tex) {
|
| @@ -324,12 +317,6 @@ protected:
|
| InstallInvalidator(copyKey, fBitmap.pixelRef());
|
| }
|
|
|
| - bool getROBitmap(SkBitmap* bitmap) override {
|
| - SkASSERT(!fBitmap.getTexture());
|
| - *bitmap = fBitmap;
|
| - return true;
|
| - }
|
| -
|
| private:
|
| static void InstallInvalidator(const GrUniqueKey& key, SkPixelRef* pixelRef) {
|
| class Invalidator : public SkPixelRef::GenIDChangeListener {
|
|
|