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

Pass image usage flags to texture loader (2D image)

Browse source
This commit is contained in:
saschawillems 2016-03-16 20:27:33 +01:00
parent 76d41fcd6d
commit 62717ea021
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
base/vulkanTextureLoader.hpp
View file

@ -60,6 +60,12 @@ namespace vkTools
// Load a 2D texture // Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear) void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear)
{
loadTexture(filename, format, texture, false, VK_IMAGE_USAGE_SAMPLED_BIT);
}
// Load a 2D texture
void loadTexture(const char* filename, VkFormat format, VulkanTexture *texture, bool forceLinear, VkImageUsageFlags imageUsageFlags)
{ {
gli::texture2D tex2D(gli::load(filename)); gli::texture2D tex2D(gli::load(filename));
assert(!tex2D.empty()); assert(!tex2D.empty());
@ -155,7 +161,7 @@ namespace vkTools
// Setup texture as blit target with optimal tiling // Setup texture as blit target with optimal tiling
imageCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL; imageCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
imageCreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; imageCreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | imageUsageFlags;
imageCreateInfo.mipLevels = texture->mipLevels; imageCreateInfo.mipLevels = texture->mipLevels;
imageCreateInfo.extent = { texture->width, texture->height, 1 }; imageCreateInfo.extent = { texture->width, texture->height, 1 };