Replaced TextureCacheEntry with GrTexture* and a back pointer to GrResourceEntry (in GrTexture)
http://codereview.appspot.com/6460089/
git-svn-id: http://skia.googlecode.com/svn/trunk@5122 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 539372a..c2fc186 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -116,7 +116,6 @@
class SkAutoCachedTexture; // used internally
protected:
- typedef GrContext::TextureCacheEntry TexCache;
bool isBitmapInTextureCache(const SkBitmap& bitmap,
const GrTextureParams& params) const;
@@ -133,7 +132,8 @@
GrClipData fClipData;
// state for our offscreen render-target
- TexCache fCache;
+ // TODO: remove 'fCached' and let fTexture automatically return to the cache
+ bool fCached; // is fTexture in the cache
GrTexture* fTexture;
GrRenderTarget* fRenderTarget;
bool fNeedClear;
@@ -143,7 +143,7 @@
void initFromRenderTarget(GrContext*, GrRenderTarget*);
// used by createCompatibleDevice
- SkGpuDevice(GrContext*, GrTexture* texture, TexCache, bool needClear);
+ SkGpuDevice(GrContext*, GrTexture* texture, bool needClear);
// override from SkDevice
virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config,