Commit 9288dcf6 by Jamie Madill Committed by Commit Bot

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: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent 14a9be44
...@@ -762,15 +762,12 @@ angle::Result TextureVk::setStorage(const gl::Context *context, ...@@ -762,15 +762,12 @@ angle::Result TextureVk::setStorage(const gl::Context *context,
const vk::Format &format = renderer->getFormat(internalFormat); const vk::Format &format = renderer->getFormat(internalFormat);
ANGLE_TRY(ensureImageAllocated(contextVk, format)); ANGLE_TRY(ensureImageAllocated(contextVk, format));
vk::CommandBuffer *commandBuffer = nullptr;
ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
if (mImage->valid()) if (mImage->valid())
{ {
releaseImage(contextVk); 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; return angle::Result::Continue;
} }
...@@ -1193,14 +1190,13 @@ angle::Result TextureVk::ensureImageInitializedImpl(ContextVk *contextVk, ...@@ -1193,14 +1190,13 @@ angle::Result TextureVk::ensureImageInitializedImpl(ContextVk *contextVk,
return angle::Result::Continue; return angle::Result::Continue;
} }
vk::CommandBuffer *commandBuffer = nullptr;
ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
if (!mImage->valid()) 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(), return mImage->flushStagedUpdates(contextVk, getNativeImageLevel(0), mImage->getLevelCount(),
getNativeImageLayer(0), mImage->getLayerCount(), getNativeImageLayer(0), mImage->getLayerCount(),
commandBuffer); commandBuffer);
...@@ -1473,8 +1469,7 @@ const vk::Sampler &TextureVk::getSampler() const ...@@ -1473,8 +1469,7 @@ const vk::Sampler &TextureVk::getSampler() const
angle::Result TextureVk::initImage(ContextVk *contextVk, angle::Result TextureVk::initImage(ContextVk *contextVk,
const vk::Format &format, const vk::Format &format,
const gl::Extents &extents, const gl::Extents &extents,
const uint32_t levelCount, const uint32_t levelCount)
vk::CommandBuffer *commandBuffer)
{ {
RendererVk *renderer = contextVk->getRenderer(); RendererVk *renderer = contextVk->getRenderer();
......
...@@ -285,8 +285,7 @@ class TextureVk : public TextureImpl ...@@ -285,8 +285,7 @@ class TextureVk : public TextureImpl
angle::Result initImage(ContextVk *contextVk, angle::Result initImage(ContextVk *contextVk,
const vk::Format &format, const vk::Format &format,
const gl::Extents &extents, const gl::Extents &extents,
const uint32_t levelCount, const uint32_t levelCount);
vk::CommandBuffer *commandBuffer);
void releaseImage(ContextVk *context); void releaseImage(ContextVk *context);
void releaseImageViews(ContextVk *contextVk); void releaseImageViews(ContextVk *contextVk);
void releaseStagingBuffer(ContextVk *context); void releaseStagingBuffer(ContextVk *context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment