diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-04-03 10:29:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 19:01:38 +0000 |
| commit | 2db3232c88cbaec5585f263111f334ca7272fe10 (patch) | |
| tree | 43f404bdd7eef064dcd7f4ef80205d96dc359687 /src | |
| parent | d531ca038fac8acb3320a78c393c002ca59768fe (diff) | |
Fix Vulkan memory leak in MSAA
BUG=skia:
Change-Id: Ia32bd6654fb3f5371d8109e04464e1932d4bab52
Reviewed-on: https://skia-review.googlesource.com/11120
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/vk/GrVkRenderTarget.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkRenderTarget.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkRenderTarget.cpp b/src/gpu/vk/GrVkRenderTarget.cpp index bb2b0664d1..d5719fdd5e 100644 --- a/src/gpu/vk/GrVkRenderTarget.cpp +++ b/src/gpu/vk/GrVkRenderTarget.cpp @@ -281,7 +281,7 @@ void GrVkRenderTarget::releaseInternalObjects() { if (fMSAAImage) { fMSAAImage->releaseImage(gpu); - fMSAAImage = nullptr; + fMSAAImage.reset(); } if (fResolveAttachmentView) { @@ -305,7 +305,7 @@ void GrVkRenderTarget::releaseInternalObjects() { void GrVkRenderTarget::abandonInternalObjects() { if (fMSAAImage) { fMSAAImage->abandonImage(); - fMSAAImage = nullptr; + fMSAAImage.reset(); } if (fResolveAttachmentView) { diff --git a/src/gpu/vk/GrVkRenderTarget.h b/src/gpu/vk/GrVkRenderTarget.h index bfecdc9d5e..cf425fb0a2 100644 --- a/src/gpu/vk/GrVkRenderTarget.h +++ b/src/gpu/vk/GrVkRenderTarget.h @@ -47,7 +47,7 @@ public: } return nullptr; } - GrVkImage* msaaImage() { return fMSAAImage; } + GrVkImage* msaaImage() { return fMSAAImage.get(); } const GrVkImageView* resolveAttachmentView() const { return fResolveAttachmentView; } const GrVkResource* stencilImageResource() const; const GrVkImageView* stencilAttachmentView() const; @@ -106,7 +106,7 @@ protected: void createFramebuffer(GrVkGpu* gpu); const GrVkImageView* fColorAttachmentView; - GrVkImage* fMSAAImage; + std::unique_ptr<GrVkImage> fMSAAImage; const GrVkImageView* fResolveAttachmentView; private: |