aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLCreateNullInterface.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2016-11-07 17:57:18 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-07 23:36:46 +0000
commit144caf55ffc692bcda77703a73bb9a894f7d024f (patch)
treefb300abb3c5d5ab959e586f401378f4d0b947dbd /src/gpu/gl/GrGLCreateNullInterface.cpp
parentad48a70e990f317d2bb6e2aa812acbf9c195e677 (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/gl/GrGLCreateNullInterface.cpp')
-rw-r--r--src/gpu/gl/GrGLCreateNullInterface.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 61f638b682..b41f826dfb 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -176,7 +176,7 @@ public:
void notifyAttachmentDeleteWhileBound(const FramebufferAttachment* deleted) {
for (auto& attachment : fAttachments) {
- if (attachment == deleted) {
+ if (attachment.get() == deleted) {
attachment.reset(nullptr);
}
}
@@ -206,7 +206,7 @@ private:
};
constexpr int static kNumAttachmentPoints = 1 + (int)AttachmentPoint::kColor;
- SkAutoTUnref<const FramebufferAttachment> fAttachments[kNumAttachmentPoints];
+ sk_sp<const FramebufferAttachment> fAttachments[kNumAttachmentPoints];
typedef GLObject INHERITED;
};
@@ -710,7 +710,7 @@ private:
GrGLuint fCurrGenericID;
GrGLuint fCurrUniformLocation;
GrGLuint fCurrPathID;
- SkAutoTUnref<const Texture> fSingleTextureObject;
+ sk_sp<const Texture> fSingleTextureObject;
SkTArray<const char*> fExtensions;
// the OpenGLES 2.0 spec says this must be >= 128
@@ -746,7 +746,7 @@ private:
if (!fSingleTextureObject) {
fSingleTextureObject.reset(new Texture);
}
- return fSingleTextureObject;
+ return fSingleTextureObject.get();
}
const GrGLubyte* CombinedExtensionString() {