commit b7d924a8f4adb5f6a5cdbcd60e75155a2bb30b92
author Jamie Madill <jmadill@chromium.org> Sat Mar 10 11:16:54 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Sat Mar 10 17:19:49 2018 +0000
tree 17855ac1e7f29b9ca803bf9a0c598ac66169e08d
parent e2995cce716198d12b73eaa77cc99c39113ea1ce

Vulkan: Make free part of DescriptorPool.

This also fixes a missed VkResult error. In order to do this
we also return an error from ProgramImpl::destroy.

Bug: angleproject:2396
Change-Id: I649b19e64732785bb33eebadea7f361245137d0f
Reviewed-on: https://chromium-review.googlesource.com/958406
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/ProgramVk.h

diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.h b/src/libANGLE/renderer/vulkan/ProgramVk.h
index 44959c2..fd0b31d 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.h
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.h
@@ -24,7 +24,7 @@
   public:
     ProgramVk(const gl::ProgramState &state);
     ~ProgramVk() override;
-    void destroy(const gl::Context *context) override;
+    gl::Error destroy(const gl::Context *context) override;
 
     gl::LinkResult load(const gl::Context *context,
                         gl::InfoLog &infoLog,
@@ -120,7 +120,7 @@
     void invalidateTextures();
 
   private:
-    void reset(ContextVk *contextVk);
+    vk::Error reset(ContextVk *contextVk);
     vk::Error initDescriptorSets(ContextVk *contextVk);
     gl::Error initDefaultUniformBlocks(const gl::Context *glContext);
     vk::Error updateDefaultUniformsDescriptorSet(ContextVk *contextVk);