aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrDrawOpAtlas.h
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-02-28 16:20:03 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-28 22:07:05 +0000
commit32f2818c9d10090efeea62ccc211d48a33322dfb (patch)
treefd301bc81387a3c3e0cc767cba43ba214a314f86 /src/gpu/GrDrawOpAtlas.h
parentdac5f6bcbec7130a209a6899444feb022719498d (diff)
Clean up/remove unused GrFragmentProcessor-derived ctors
This is the simple (i.e., non-TextureAdjuster) portion of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors) Change-Id: I8f673ebe922e03c69473c18c166bcf818507c662 Reviewed-on: https://skia-review.googlesource.com/8997 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpAtlas.h')
-rw-r--r--src/gpu/GrDrawOpAtlas.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h
index 7a7da6c9be..917d4ecab6 100644
--- a/src/gpu/GrDrawOpAtlas.h
+++ b/src/gpu/GrDrawOpAtlas.h
@@ -55,7 +55,7 @@ public:
*/
typedef void (*EvictionFunc)(GrDrawOpAtlas::AtlasID, void*);
- GrDrawOpAtlas(sk_sp<GrTexture>, int numPlotsX, int numPlotsY);
+ GrDrawOpAtlas(GrContext*, sk_sp<GrTextureProxy>, int numPlotsX, int numPlotsY);
/**
* Adds a width x height subimage to the atlas. Upon success it returns an ID and the subimage's
@@ -72,7 +72,8 @@ public:
bool addToAtlas(AtlasID*, GrDrawOp::Target*, int width, int height, const void* image,
SkIPoint16* loc);
- GrTexture* getTexture() const { return fTexture.get(); }
+ GrContext* context() const { return fContext; }
+ sk_sp<GrTextureProxy> getProxy() const { return fProxy; }
uint64_t atlasGeneration() const { return fAtlasGeneration; }
@@ -265,12 +266,13 @@ private:
inline void processEviction(AtlasID);
- sk_sp<GrTexture> fTexture;
- int fPlotWidth;
- int fPlotHeight;
- SkDEBUGCODE(uint32_t fNumPlots;)
+ GrContext* fContext;
+ sk_sp<GrTextureProxy> fProxy;
+ int fPlotWidth;
+ int fPlotHeight;
+ SkDEBUGCODE(uint32_t fNumPlots;)
- uint64_t fAtlasGeneration;
+ uint64_t fAtlasGeneration;
struct EvictionData {
EvictionFunc fFunc;