diff options
author | Hal Canary <halcanary@google.com> | 2016-11-07 17:57:18 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 23:36:46 +0000 |
commit | 144caf55ffc692bcda77703a73bb9a894f7d024f (patch) | |
tree | fb300abb3c5d5ab959e586f401378f4d0b947dbd /src/gpu/instanced/InstancedRendering.h | |
parent | ad48a70e990f317d2bb6e2aa812acbf9c195e677 (diff) |
src/gpu: s/SkAutoTUnref/sk_sp/g
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4527
Change-Id: I23f0548f98e7c355da05e143e8baa330d4bc04cc
Reviewed-on: https://skia-review.googlesource.com/4527
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/instanced/InstancedRendering.h')
-rw-r--r-- | src/gpu/instanced/InstancedRendering.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/instanced/InstancedRendering.h b/src/gpu/instanced/InstancedRendering.h index b71ca80c39..1325370a28 100644 --- a/src/gpu/instanced/InstancedRendering.h +++ b/src/gpu/instanced/InstancedRendering.h @@ -36,7 +36,7 @@ class InstancedRendering : public SkNoncopyable { public: virtual ~InstancedRendering() { SkASSERT(State::kRecordingDraws == fState); } - GrGpu* gpu() const { return fGpu; } + GrGpu* gpu() const { return fGpu.get(); } /** * These methods make a new record internally for an instanced draw, and return a batch that is @@ -147,8 +147,8 @@ protected: InstancedRendering(GrGpu* gpu); const BatchList& trackedBatches() const { return fTrackedBatches; } - const GrBuffer* vertexBuffer() const { SkASSERT(fVertexBuffer); return fVertexBuffer; } - const GrBuffer* indexBuffer() const { SkASSERT(fIndexBuffer); return fIndexBuffer; } + const GrBuffer* vertexBuffer() const { SkASSERT(fVertexBuffer); return fVertexBuffer.get(); } + const GrBuffer* indexBuffer() const { SkASSERT(fIndexBuffer); return fIndexBuffer.get(); } virtual void onBeginFlush(GrResourceProvider*) = 0; virtual void onDraw(const GrPipeline&, const InstanceProcessor&, const Batch*) = 0; @@ -171,14 +171,14 @@ private: virtual Batch* createBatch() = 0; - const SkAutoTUnref<GrGpu> fGpu; + const sk_sp<GrGpu> fGpu; State fState; GrMemoryPool fDrawPool; SkSTArray<1024, ParamsTexel, true> fParams; BatchList fTrackedBatches; - SkAutoTUnref<const GrBuffer> fVertexBuffer; - SkAutoTUnref<const GrBuffer> fIndexBuffer; - SkAutoTUnref<GrBuffer> fParamsBuffer; + sk_sp<const GrBuffer> fVertexBuffer; + sk_sp<const GrBuffer> fIndexBuffer; + sk_sp<GrBuffer> fParamsBuffer; }; } |