Vulkan: Remove command buffer param from initImage.

This method didn't use the parameter. Removing it simplifies the code. Bug: angleproject:2464 Change-Id: Ib8f5f649f66eae405fb91f7cfcc8cefc4c44bda2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1771992 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Remove command buffer param from initImage.
9288dcf6 · Jamie Madill · Commit Bot · 14a9be44 · 9288dcf6 · 9288dcf6
Commit 9288dcf6 authored Aug 27, 2019 by Jamie Madill Committed by Commit Bot Aug 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

TextureVk.cpp src/libANGLE/renderer/vulkan/TextureVk.cpp +5 -10

TextureVk.h src/libANGLE/renderer/vulkan/TextureVk.h +1 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -762,15 +762,12 @@ angle::Result TextureVk::setStorage(const gl::Context *context,
    const vk::Format &format = renderer->getFormat(internalFormat);
    ANGLE_TRY(ensureImageAllocated(contextVk, format));

-    vk::CommandBuffer *commandBuffer = nullptr;
-    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
-
    if (mImage->valid())
    {
        releaseImage(contextVk);
    }

-    ANGLE_TRY(initImage(contextVk, format, size, static_cast<uint32_t>(levels), commandBuffer));
+    ANGLE_TRY(initImage(contextVk, format, size, static_cast<uint32_t>(levels)));
    return angle::Result::Continue;
 }

@@ -1193,14 +1190,13 @@ angle::Result TextureVk::ensureImageInitializedImpl(ContextVk *contextVk,
        return angle::Result::Continue;
    }

-    vk::CommandBuffer *commandBuffer = nullptr;
-    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
-
    if (!mImage->valid())
    {
-        ANGLE_TRY(initImage(contextVk, format, baseLevelExtents, levelCount, commandBuffer));
+        ANGLE_TRY(initImage(contextVk, format, baseLevelExtents, levelCount));
    }

+    vk::CommandBuffer *commandBuffer = nullptr;
+    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
    return mImage->flushStagedUpdates(contextVk, getNativeImageLevel(0), mImage->getLevelCount(),
                                      getNativeImageLayer(0), mImage->getLayerCount(),
                                      commandBuffer);
@@ -1473,8 +1469,7 @@ const vk::Sampler &TextureVk::getSampler() const
 angle::Result TextureVk::initImage(ContextVk *contextVk,
                                   const vk::Format &format,
                                   const gl::Extents &extents,
-                                   const uint32_t levelCount,
-                                   vk::CommandBuffer *commandBuffer)
+                                   const uint32_t levelCount)
 {
    RendererVk *renderer = contextVk->getRenderer();


--- a/src/libANGLE/renderer/vulkan/TextureVk.h
+++ b/src/libANGLE/renderer/vulkan/TextureVk.h
@@ -285,8 +285,7 @@ class TextureVk : public TextureImpl
    angle::Result initImage(ContextVk *contextVk,
                            const vk::Format &format,
                            const gl::Extents &extents,
-                            const uint32_t levelCount,
-                            vk::CommandBuffer *commandBuffer);
+                            const uint32_t levelCount);
    void releaseImage(ContextVk *context);
    void releaseImageViews(ContextVk *contextVk);
    void releaseStagingBuffer(ContextVk *context);