commit 785e8a0b7db3de4330b3682c8a2b5183ed73fdee
author Jamie Madill <jmadill@chromium.org> Thu Oct 04 17:42:00 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Oct 05 11:14:22 2018 +0000
tree b866e7a89e24f37e6b3b4c78e6f5cda5da829219
parent 0ca09753392d43fb30f689a2f037b609c49472c8

Remove gl::LinkResult.

Instead of returning a small struct from LinkProgram calls we use
angle::Result. Linking can have 3 cases:

- the link was successful -> angle::Result::Continue
- the link failed -> angle::Result::Incomplete
- there was an internal error -> angle::Result::Stop

Note that any unexpected Incomplete is still an error. Each function
that accepts Incomplete must check explicitly.

This is the last user of ErrorOrResult.

Bug: angleproject:2491
Change-Id: Idba23be27efe4b561720a4bdd8fe486b40779497
Reviewed-on: https://chromium-review.googlesource.com/c/1255645
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@google.com>

src/libANGLE/renderer/vulkan/ProgramVk.h

diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.h b/src/libANGLE/renderer/vulkan/ProgramVk.h
index 574d35d..8509f8a 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.h
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.h
@@ -25,9 +25,9 @@
     ~ProgramVk() override;
     gl::Error destroy(const gl::Context *context) override;
 
-    gl::LinkResult load(const gl::Context *context,
-                        gl::InfoLog &infoLog,
-                        gl::BinaryInputStream *stream) override;
+    angle::Result load(const gl::Context *context,
+                       gl::InfoLog &infoLog,
+                       gl::BinaryInputStream *stream) override;
     void save(const gl::Context *context, gl::BinaryOutputStream *stream) override;
     void setBinaryRetrievableHint(bool retrievable) override;
     void setSeparable(bool separable) override;
@@ -136,9 +136,9 @@
 
     template <typename T>
     void setUniformImpl(GLint location, GLsizei count, const T *v, GLenum entryPointType);
-    gl::LinkResult linkImpl(const gl::Context *context,
-                            const gl::ProgramLinkedResources &resources,
-                            gl::InfoLog &infoLog);
+    angle::Result linkImpl(const gl::Context *glContext,
+                           const gl::ProgramLinkedResources &resources,
+                           gl::InfoLog &infoLog);
 
     // State for the default uniform blocks.
     struct DefaultUniformBlock final : private angle::NonCopyable