claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved tool functions to vks namespace (Refs #260)

Browse source
This commit is contained in:
saschawillems 2017-02-12 13:10:05 +01:00
parent a105dfdece
commit 1309ee0ef9
34 changed files with 376 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

20
base/VulkanTexture.hpp
View file

@ -17,7 +17,7 @@
#include <gli/gli.hpp>
#include "vulkantools.h"
#include "VulkanTools.h"
#include "VulkanDevice.hpp"
#include "VulkanBuffer.hpp"
@ -216,7 +216,7 @@ namespace vks
// Image barrier for optimal image (target)
// Optimal image will be used as destination for the copy
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -236,7 +236,7 @@ namespace vks
// Change texture image layout to shader read after all mip levels have been copied
this->imageLayout = imageLayout;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -320,7 +320,7 @@ namespace vks
imageLayout = imageLayout;
// Setup image memory barrier
vkTools::setImageLayout(copyCmd, image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED, imageLayout);
vks::tools::setImageLayout(copyCmd, image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED, imageLayout);
device->flushCommandBuffer(copyCmd, copyQueue);
}
@ -477,7 +477,7 @@ namespace vks
// Image barrier for optimal image (target)
// Optimal image will be used as destination for the copy
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -497,7 +497,7 @@ namespace vks
// Change texture image layout to shader read after all mip levels have been copied
this->imageLayout = imageLayout;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -688,7 +688,7 @@ namespace vks
subresourceRange.levelCount = mipLevels;
subresourceRange.layerCount = layerCount;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -707,7 +707,7 @@ namespace vks
// Change texture image layout to shader read after all faces have been copied
this->imageLayout = imageLayout;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -899,7 +899,7 @@ namespace vks
subresourceRange.levelCount = mipLevels;
subresourceRange.layerCount = 6;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,
@ -918,7 +918,7 @@ namespace vks
// Change texture image layout to shader read after all faces have been copied
this->imageLayout = imageLayout;
vkTools::setImageLayout(
vks::tools::setImageLayout(
copyCmd,
image,
VK_IMAGE_ASPECT_COLOR_BIT,