commit c57ee259d645606cd0db449e650db524964133a4
author Jamie Madill <jmadill@chromium.org> Wed May 30 19:53:48 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu May 31 00:59:43 2018 +0000
tree 94373076dad7ae819c72a1d9b97a672c869ece13
parent d014c9e665ad23ca2938873b38dcbde4ad9b87ba

Vulkan: Clean up object releasing APIs.

This cleans up the confusing releaseResource/releaseObject pair in the
RendererVk class. It also makes getQueueSerial private in ResourceVk
but keeps a public isResourceInUse API for external use.

Bug: angleproject:2539
Change-Id: I6b4f24db16e36130a85ef03fc2c3b26d8d9e1fba
Reviewed-on: https://chromium-review.googlesource.com/1069291
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

src/libANGLE/renderer/vulkan/TextureVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/TextureVk.cpp b/src/libANGLE/renderer/vulkan/TextureVk.cpp
index 724c69d..e83f702 100644
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -392,7 +392,7 @@
     RendererVk *renderer = contextVk->getRenderer();
 
     releaseImage(context, renderer);
-    renderer->releaseResource(*this, &mSampler);
+    renderer->releaseObject(getStoredQueueSerial(), &mSampler);
 
     mPixelBuffer.release(renderer);
     return gl::NoError();
@@ -752,7 +752,7 @@
     if (mSampler.valid())
     {
         RendererVk *renderer = contextVk->getRenderer();
-        renderer->releaseResource(*this, &mSampler);
+        renderer->releaseObject(getStoredQueueSerial(), &mSampler);
     }
 
     const gl::SamplerState &samplerState = mState.getSamplerState();
@@ -861,8 +861,8 @@
 void TextureVk::releaseImage(const gl::Context *context, RendererVk *renderer)
 {
     mImage.release(renderer->getCurrentQueueSerial(), renderer);
-    renderer->releaseResource(*this, &mBaseLevelImageView);
-    renderer->releaseResource(*this, &mMipmapImageView);
+    renderer->releaseObject(getStoredQueueSerial(), &mBaseLevelImageView);
+    renderer->releaseObject(getStoredQueueSerial(), &mMipmapImageView);
     onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
 }