commit 2660b5031f1141534e8969a8bb93b3401fa870cd
author Shahbaz Youssefi <syoussefi@chromium.org> Thu Mar 21 12:08:40 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Sat Mar 23 04:51:10 2019 +0000
tree 353ad8976bd7db68db996f802a772346361b9112
parent a8ff88143af676ac493e0df7d1a81997066c1cd0

Vulkan: Restore CommandBuffer to namespace vk

Moved vk::CommandBuffer and vk::SecondaryCommandBuffer to vk::priv:: and
aliased vk::CommandBuffer to one or the other.  This allows the rest of
the classes to continue seeing vk::CommandBuffer as they used to do.
Used a special alias for the primary command buffer that gets submitted
(vk::PrimaryCommandBuffer).

Bug: angleproject:3136
Change-Id: I61236fd182230991db7395d05e3da3be5e3f45be
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1534456
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 21a57a7..2a66698 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -166,7 +166,7 @@
     ContextVk *contextVk = vk::GetImpl(context);
 
     // This command buffer is only started once.
-    CommandBufferT *commandBuffer = nullptr;
+    vk::CommandBuffer *commandBuffer = nullptr;
 
     const gl::FramebufferAttachment *depthAttachment = mState.getDepthAttachment();
     bool clearDepth = (depthAttachment && (mask & GL_DEPTH_BUFFER_BIT) != 0);
@@ -424,7 +424,7 @@
     VkImageAspectFlags aspectMask =
         vk::GetDepthStencilAspectFlagsForCopy(blitDepthBuffer, blitStencilBuffer);
 
-    CommandBufferT *commandBuffer = nullptr;
+    vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
 
     vk::ImageHelper *writeImage = drawRenderTarget->getImageForWrite(&mFramebuffer);
@@ -509,7 +509,7 @@
 
     // Reinitialize the commandBuffer after a read pixels because it calls
     // renderer->finish which makes command buffers obsolete.
-    CommandBufferT *commandBuffer = nullptr;
+    vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
 
     // We read the bytes of the image in a buffer, now we have to copy them into the
@@ -669,7 +669,7 @@
 
     vk::ImageHelper *dstImage = drawRenderTarget->getImageForWrite(&mFramebuffer);
 
-    CommandBufferT *commandBuffer = nullptr;
+    vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
 
     const vk::Format &readImageFormat = readRenderTarget->getImageFormat();
@@ -903,8 +903,8 @@
 
     // This command can only happen inside a render pass, so obtain one if its already happening
     // or create a new one if not.
-    CommandBufferT *commandBuffer = nullptr;
-    vk::RecordingMode mode        = vk::RecordingMode::Start;
+    vk::CommandBuffer *commandBuffer = nullptr;
+    vk::RecordingMode mode           = vk::RecordingMode::Start;
     ANGLE_TRY(getCommandBufferForDraw(contextVk, &commandBuffer, &mode));
 
     // The array layer is offset by the ImageView. So we shouldn't need to set a base array layer.
@@ -1032,7 +1032,7 @@
 }
 
 angle::Result FramebufferVk::getCommandBufferForDraw(ContextVk *contextVk,
-                                                     CommandBufferT **commandBufferOut,
+                                                     vk::CommandBuffer **commandBufferOut,
                                                      vk::RecordingMode *modeOut)
 {
     RendererVk *renderer = contextVk->getRenderer();
@@ -1048,7 +1048,7 @@
 }
 
 angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
-                                                CommandBufferT **commandBufferOut)
+                                                vk::CommandBuffer **commandBufferOut)
 {
     vk::Framebuffer *framebuffer = nullptr;
     ANGLE_TRY(getFramebuffer(contextVk, &framebuffer));
@@ -1056,7 +1056,7 @@
     // TODO(jmadill): Proper clear value implementation. http://anglebug.com/2361
     std::vector<VkClearValue> attachmentClearValues;
 
-    CommandBufferT *writeCommands = nullptr;
+    vk::CommandBuffer *writeCommands = nullptr;
     ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &writeCommands));
 
     vk::RenderPassDesc renderPassDesc;
@@ -1112,7 +1112,7 @@
 
     ANGLE_TRY(renderTarget->ensureImageInitialized(contextVk));
 
-    CommandBufferT *commandBuffer = nullptr;
+    vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
 
     // Note that although we're reading from the image, we need to update the layout below.