Skip to content

Commit

Permalink
Renamed parameter to make it clearer it's scope
Browse files Browse the repository at this point in the history
  • Loading branch information
robertosfield committed Feb 18, 2019
1 parent fe277b6 commit 779f033
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/vsg/vk/Descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace vsg
};

/// transfer Data to graphics memory, returning ImageData configuration.
extern VSG_DECLSPEC vsg::ImageData transferImageData(Device* device, CommandPool* commandPool, VkQueue graphicsQueue, const Data* data, Sampler* sampler = nullptr);
extern VSG_DECLSPEC vsg::ImageData transferImageData(Device* device, CommandPool* commandPool, VkQueue queue, const Data* data, Sampler* sampler = nullptr);

using ImageDataList = std::vector<ImageData>;

Expand Down
4 changes: 2 additions & 2 deletions src/vsg/vk/Descriptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

using namespace vsg;

ImageData vsg::transferImageData(Device* device, CommandPool* commandPool, VkQueue graphicsQueue, const Data* data, Sampler* sampler)
ImageData vsg::transferImageData(Device* device, CommandPool* commandPool, VkQueue queue, const Data* data, Sampler* sampler)
{
if (!data)
{
Expand Down Expand Up @@ -71,7 +71,7 @@ ImageData vsg::transferImageData(Device* device, CommandPool* commandPool, VkQue

textureImage->bind(textureImageDeviceMemory, 0);

dispatchCommandsToQueue(device, commandPool, graphicsQueue, [&](VkCommandBuffer commandBuffer) {
dispatchCommandsToQueue(device, commandPool, queue, [&](VkCommandBuffer commandBuffer) {
ImageMemoryBarrier preCopyImageMemoryBarrier(
0, VK_ACCESS_TRANSFER_WRITE_BIT,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
Expand Down

0 comments on commit 779f033

Please sign in to comment.