diff options
| author |  reed <reed@google.com> | 2016-08-17 13:24:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-17 13:24:05 -0700 |
| commit | 0e7bddfb340a558f1ef0f554e64b4339ca939aea (patch) | |
| tree | 995932195da173b14033dbbdf488bb4f5ec28c78 /src/image | |
| parent | bd4121ab24f16f0ddaef4701e3636eae94d2c301 (diff) | |
fix no-gpu build
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2253073003
TBR=robertphilips
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2253073003
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage_Base.h | 7 | ||||
| -rw-r--r-- | src/image/SkImage_Raster.cpp | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 09971c1198..a1da0fa559 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -8,11 +8,14 @@ #ifndef SkImage_Base_DEFINED #define SkImage_Base_DEFINED -#include "GrTexture.h" #include "SkAtomics.h" #include "SkImage.h" #include "SkSurface.h" +#if SK_SUPPORT_GPU + #include "GrTexture.h" +#endif + #include <new> class GrTextureParams; @@ -41,7 +44,9 @@ public: int srcX, int srcY, CachingHint) const; virtual GrTexture* peekTexture() const { return nullptr; } +#if SK_SUPPORT_GPU virtual sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const { return nullptr; } +#endif virtual SkImageCacherator* peekCacherator() const { return nullptr; } // return a read-only copy of the pixels. We promise to not modify them, diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index abdecb9794..acfacea574 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -17,6 +17,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrImageIDTextureAdjuster.h" #include "SkGr.h" #include "SkGrPriv.h" #endif @@ -194,8 +195,6 @@ bool SkImage_Raster::getROPixels(SkBitmap* dst, CachingHint) const { return true; } -#include "GrImageIDTextureAdjuster.h" - GrTexture* SkImage_Raster::asTextureRef(GrContext* ctx, const GrTextureParams& params, SkSourceGammaTreatment gammaTreatment) const { #if SK_SUPPORT_GPU |