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.cpp

diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.cpp b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
index 70c0cca..502574a 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.cpp
@@ -234,12 +234,12 @@
     return angle::Result::Continue();
 }
 
-gl::LinkResult ProgramVk::load(const gl::Context *context,
-                               gl::InfoLog &infoLog,
-                               gl::BinaryInputStream *stream)
+angle::Result ProgramVk::load(const gl::Context *context,
+                              gl::InfoLog &infoLog,
+                              gl::BinaryInputStream *stream)
 {
     UNIMPLEMENTED();
-    return gl::InternalError();
+    return angle::Result::Stop();
 }
 
 void ProgramVk::save(const gl::Context *context, gl::BinaryOutputStream *stream)
@@ -257,18 +257,18 @@
     UNIMPLEMENTED();
 }
 
-std::unique_ptr<LinkEvent> ProgramVk::link(const gl::Context *glContext,
+std::unique_ptr<LinkEvent> ProgramVk::link(const gl::Context *context,
                                            const gl::ProgramLinkedResources &resources,
                                            gl::InfoLog &infoLog)
 {
     // TODO(jie.a.chen@intel.com): Parallelize linking.
     // http://crbug.com/849576
-    return std::make_unique<LinkEventDone>(linkImpl(glContext, resources, infoLog));
+    return std::make_unique<LinkEventDone>(linkImpl(context, resources, infoLog));
 }
 
-gl::LinkResult ProgramVk::linkImpl(const gl::Context *glContext,
-                                   const gl::ProgramLinkedResources &resources,
-                                   gl::InfoLog &infoLog)
+angle::Result ProgramVk::linkImpl(const gl::Context *glContext,
+                                  const gl::ProgramLinkedResources &resources,
+                                  gl::InfoLog &infoLog)
 {
     ContextVk *contextVk = vk::GetImpl(glContext);
     RendererVk *renderer = contextVk->getRenderer();
@@ -343,7 +343,7 @@
         }
     }
 
-    return true;
+    return angle::Result::Continue();
 }
 
 angle::Result ProgramVk::initDefaultUniformBlocks(const gl::Context *glContext)