commit 2778029563f218ab744adfae263fe81c8638f8f1
author Yuly Novikov <ynovikov@chromium.org> Fri Nov 09 11:19:49 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Nov 13 17:09:42 2018 +0000
tree bcd48aae478771a6948b413b2f7a9f745869ebaa
parent 0864a7ac638c80d3af2010a3976ff4cff1d4a79a

Vulkan: refactor WrappedObject descendants

Methods receive VkDevice instead of Context
and return VkResult instead of angle::Result now.

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

src/libANGLE/renderer/vulkan/CommandGraph.cpp

diff --git a/src/libANGLE/renderer/vulkan/CommandGraph.cpp b/src/libANGLE/renderer/vulkan/CommandGraph.cpp
index bc9363c..b1d9ad1 100644
--- a/src/libANGLE/renderer/vulkan/CommandGraph.cpp
+++ b/src/libANGLE/renderer/vulkan/CommandGraph.cpp
@@ -38,14 +38,14 @@
     createInfo.level                       = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
     createInfo.commandBufferCount          = 1;
 
-    ANGLE_TRY(commandBuffer->init(context, createInfo));
+    ANGLE_VK_TRY(context, commandBuffer->init(context->getDevice(), createInfo));
 
     VkCommandBufferBeginInfo beginInfo = {};
     beginInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
     beginInfo.flags                    = flags | VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
     beginInfo.pInheritanceInfo         = &inheritanceInfo;
 
-    ANGLE_TRY(commandBuffer->begin(context, beginInfo));
+    ANGLE_VK_TRY(context, commandBuffer->begin(beginInfo));
     return angle::Result::Continue();
 }
 
@@ -505,7 +505,7 @@
 
             if (mOutsideRenderPassCommands.valid())
             {
-                ANGLE_TRY(mOutsideRenderPassCommands.end(context));
+                ANGLE_VK_TRY(context, mOutsideRenderPassCommands.end());
                 primaryCommandBuffer->executeCommands(1, &mOutsideRenderPassCommands);
             }
 
@@ -517,7 +517,7 @@
                 ANGLE_TRY(renderPassCache->getCompatibleRenderPass(context, serial, mRenderPassDesc,
                                                                    &renderPass));
 
-                ANGLE_TRY(mInsideRenderPassCommands.end(context));
+                ANGLE_VK_TRY(context, mInsideRenderPassCommands.end());
 
                 VkRenderPassBeginInfo beginInfo = {};
                 beginInfo.sType                 = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
@@ -658,7 +658,7 @@
     primaryInfo.level                       = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
     primaryInfo.commandBufferCount          = 1;
 
-    ANGLE_TRY(primaryCommandBufferOut->init(context, primaryInfo));
+    ANGLE_VK_TRY(context, primaryCommandBufferOut->init(context->getDevice(), primaryInfo));
 
     if (mEnableGraphDiagnostics)
     {
@@ -672,7 +672,7 @@
     beginInfo.flags                    = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
     beginInfo.pInheritanceInfo         = nullptr;
 
-    ANGLE_TRY(primaryCommandBufferOut->begin(context, beginInfo));
+    ANGLE_VK_TRY(context, primaryCommandBufferOut->begin(beginInfo));
 
     ANGLE_TRY(context->getRenderer()->traceGpuEvent(
         context, primaryCommandBufferOut, TRACE_EVENT_PHASE_BEGIN, "Primary Command Buffer"));
@@ -713,7 +713,7 @@
     ANGLE_TRY(context->getRenderer()->traceGpuEvent(
         context, primaryCommandBufferOut, TRACE_EVENT_PHASE_END, "Primary Command Buffer"));
 
-    ANGLE_TRY(primaryCommandBufferOut->end(context));
+    ANGLE_VK_TRY(context, primaryCommandBufferOut->end());
 
     // TODO(jmadill): Use pool allocation so we don't need to deallocate command graph.
     for (CommandGraphNode *node : mNodes)