commit 6cad77364bbd3a3574a87894fa93ea32c48bb5af
author Jamie Madill <jmadill@chromium.org> Wed Jul 11 09:01:17 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Jul 11 17:53:49 2018 +0000
tree bb162edfa94b6445f12edf31c669005bcb274d12
parent 84c11c539475092e7e6d274eed98c2749cbe903a

Vulkan: Remove vk::ErrorOrResult.

The ErrorOrResult pattern doesn't help much. Removing it enables the
Error passing refactor in the Vulkan back-end.

Bug: angleproject:2713
Change-Id: I4e8277ad856c785bf22b4d37b7ae880b534ef005
Reviewed-on: https://chromium-review.googlesource.com/1128919
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
index 75cf42d..65b1916 100644
--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -322,10 +322,10 @@
 vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
 {
     gl::Extents windowSize;
-    ANGLE_TRY_RESULT(createSurfaceVk(renderer), windowSize);
+    ANGLE_TRY(createSurfaceVk(renderer, &windowSize));
 
     uint32_t presentQueue = 0;
-    ANGLE_TRY_RESULT(renderer->selectPresentQueueForSurface(mSurface), presentQueue);
+    ANGLE_TRY(renderer->selectPresentQueueForSurface(mSurface, &presentQueue));
     ANGLE_UNUSED_VARIABLE(presentQueue);
 
     const VkPhysicalDevice &physicalDevice = renderer->getPhysicalDevice();