commit 21061026100668b9f5b9950e8bfc8d52ce5de271
author Jamie Madill <jmadill@chromium.org> Thu Jul 12 23:56:30 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jul 13 17:07:09 2018 +0000
tree 21219e0e9ff3239c0e28b31f61af0b64013522a1
parent 6b873dd796dca13172a8699eba0517c3a79cb08f

Vulkan: Use angle::Result error handling.

Introduces a vk::Context class to contain an error handler and Renderer
pointer. This abtracts the common code path for ContextVk + DisplayVk.

Removes vk::Error in favor of the POD angle::Result class. There are a
few remaining usages of gl::Error that will have to be cleaned up when
we can change the front-end APIs.

Bug: angleproject:2713

Change-Id: I5e68f223d595c6c561b59d6a85759e5738ed43c6
Reviewed-on: https://chromium-review.googlesource.com/1128924
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@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 c961cdd..3cf3b9b 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.h
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.h
@@ -104,7 +104,7 @@
     const vk::ShaderModule &getLinkedFragmentModule() const;
     Serial getFragmentModuleSerial() const;
 
-    vk::Error updateUniforms(ContextVk *contextVk);
+    angle::Result updateUniforms(ContextVk *contextVk);
 
     const std::vector<VkDescriptorSet> &getDescriptorSets() const;
     const uint32_t *getDynamicOffsets();
@@ -133,10 +133,10 @@
                             GLboolean transpose,
                             const GLfloat *value);
 
-    vk::Error reset(ContextVk *contextVk);
-    vk::Error allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex);
+    angle::Result reset(ContextVk *contextVk);
+    angle::Result allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex);
     gl::Error initDefaultUniformBlocks(const gl::Context *glContext);
-    vk::Error updateDefaultUniformsDescriptorSet(ContextVk *contextVk);
+    angle::Result updateDefaultUniformsDescriptorSet(ContextVk *contextVk);
 
     template <class T>
     void getUniformImpl(GLint location, T *v, GLenum entryPointType) const;