AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix no-gpu build

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2253073003

TBR=robertphilips
NOTREECHECKS=true

Review-Url: https://codereview.chromium.org/2253073003
This commit is contained in:
reed 2016-08-17 13:24:05 -07:00 committed by Commit bot
parent bd4121ab24
commit 0e7bddfb34
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/image/SkImage_Base.h
View File

@ -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,

3
src/image/SkImage_Raster.cpp
View File

@ -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