LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: add support for 2d array textures

Browse Source
This commit is contained in:
niki
2022-08-01 15:53:31 +02:00
parent 8cf7a79657
commit 224b9e84f0
5 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Graphics.cpp
+1 -1
View File
@@ -303,8 +303,8 @@ void Graphics::initCapabilities() {
static_assert(LIMIT_MAX_ENUM == 13, "Graphics::initCapabilities must be updated when adding a new system limit!"); static_assert(LIMIT_MAX_ENUM == 13, "Graphics::initCapabilities must be updated when adding a new system limit!");
capabilities.textureTypes[TEXTURE_2D] = true; capabilities.textureTypes[TEXTURE_2D] = true;
capabilities.textureTypes[TEXTURE_2D_ARRAY] = true;
capabilities.textureTypes[TEXTURE_VOLUME] = false; capabilities.textureTypes[TEXTURE_VOLUME] = false;
capabilities.textureTypes[TEXTURE_2D_ARRAY] = false;
capabilities.textureTypes[TEXTURE_CUBE] = false; capabilities.textureTypes[TEXTURE_CUBE] = false;
} }
src/modules/graphics/vulkan/Texture.cpp
+37 -22
View File
@@ -21,16 +21,29 @@ bool Texture::loadVolatile() {
auto vulkanFormat = Vulkan::getTextureFormat(format); auto vulkanFormat = Vulkan::getTextureFormat(format);
VkImageUsageFlags usageFlags = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // fixme: can we cut down these flags?
VkImageUsageFlags usageFlags =
VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
VK_IMAGE_USAGE_TRANSFER_DST_BIT |
VK_IMAGE_USAGE_SAMPLED_BIT |
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
layerCount = 1;
if (texType == TEXTURE_VOLUME)
layerCount = getDepth();
else if (texType == TEXTURE_2D_ARRAY)
layerCount = getLayerCount();
else if (texType == TEXTURE_CUBE)
layerCount = 6;
VkImageCreateInfo imageInfo{}; VkImageCreateInfo imageInfo{};
imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
imageInfo.imageType = VK_IMAGE_TYPE_2D; imageInfo.imageType = Vulkan::getImageType(getTextureType());
imageInfo.extent.width = static_cast<uint32_t>(width); imageInfo.extent.width = static_cast<uint32_t>(width);
imageInfo.extent.height = static_cast<uint32_t>(height); imageInfo.extent.height = static_cast<uint32_t>(height);
imageInfo.extent.depth = 1; imageInfo.extent.depth = 1;
imageInfo.mipLevels = 1; imageInfo.mipLevels = 1;
imageInfo.arrayLayers = 1; imageInfo.arrayLayers = layerCount;
imageInfo.format = vulkanFormat.internalFormat; imageInfo.format = vulkanFormat.internalFormat;
imageInfo.tiling = VK_IMAGE_TILING_OPTIMAL; imageInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
imageInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; imageInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
@@ -44,21 +57,23 @@ bool Texture::loadVolatile() {
throw love::Exception("failed to create image"); throw love::Exception("failed to create image");
} }
// fixme: we should use VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL as the default image layout instead of VK_IMAGE_LAYOUT_GENERAL. // fixme: we should use VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL as the default image layout instead of VK_IMAGE_LAYOUT_GENERAL.
vgfx->queueDatatransfer([textureImage = textureImage](VkCommandBuffer commandBuffer){ vgfx->queueDatatransfer([textureImage = textureImage, layerCount = layerCount](VkCommandBuffer commandBuffer){
Vulkan::cmdTransitionImageLayout(commandBuffer, textureImage, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL); Vulkan::cmdTransitionImageLayout(commandBuffer, textureImage, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL, 0, 1, 0, layerCount);
}, nullptr); }, nullptr);
if (data) { if (data) {
auto sliceData = data->get(0, 0); for (int slice = 0; slice < layerCount; slice++) {
auto size = sliceData->getSize(); auto sliceData = data->get(slice, 0);
auto dataPtr = sliceData->getData(); auto size = sliceData->getSize();
Rect rect{}; auto dataPtr = sliceData->getData();
rect.x = 0; Rect rect{};
rect.y = 0; rect.x = 0;
rect.w = sliceData->getWidth(); rect.y = 0;
rect.h = sliceData->getHeight(); rect.w = sliceData->getWidth();
rect.h = sliceData->getHeight();
uploadByteData(format, dataPtr, size, 0, 0, rect); uploadByteData(format, dataPtr, size, 0, slice, rect);
}
} else { } else {
if (isRenderTarget()) { if (isRenderTarget()) {
clear(false); clear(false);
@@ -102,13 +117,13 @@ void Texture::createTextureImageView() {
VkImageViewCreateInfo viewInfo{}; VkImageViewCreateInfo viewInfo{};
viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; viewInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
viewInfo.image = textureImage; viewInfo.image = textureImage;
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D; viewInfo.viewType = Vulkan::getImageViewType(getTextureType());
viewInfo.format = vulkanFormat.internalFormat; viewInfo.format = vulkanFormat.internalFormat;
viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
viewInfo.subresourceRange.baseMipLevel = 0; viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.levelCount = 1; viewInfo.subresourceRange.levelCount = 1;
viewInfo.subresourceRange.baseArrayLayer = 0; viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1; viewInfo.subresourceRange.layerCount = layerCount;
viewInfo.components.r = vulkanFormat.swizzleR; viewInfo.components.r = vulkanFormat.swizzleR;
viewInfo.components.g = vulkanFormat.swizzleG; viewInfo.components.g = vulkanFormat.swizzleG;
viewInfo.components.b = vulkanFormat.swizzleB; viewInfo.components.b = vulkanFormat.swizzleB;
@@ -154,7 +169,7 @@ void Texture::clear(bool white) {
VkImageSubresourceRange range{}; VkImageSubresourceRange range{};
range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
range.layerCount = getMipmapCount(); range.layerCount = layerCount;
range.levelCount = 1; range.levelCount = 1;
vkCmdClearColorImage(commandBuffer, textureImage, VK_IMAGE_LAYOUT_GENERAL, &clearColor, 1, &range); vkCmdClearColorImage(commandBuffer, textureImage, VK_IMAGE_LAYOUT_GENERAL, &clearColor, 1, &range);
@@ -231,15 +246,15 @@ void Texture::uploadByteData(PixelFormat pixelformat, const void* data, size_t s
memcpy(allocInfo.pMappedData, data, size); memcpy(allocInfo.pMappedData, data, size);
auto command = [buffer = stagingBuffer, image = textureImage, r = r](VkCommandBuffer commandBuffer) { auto command = [buffer = stagingBuffer, image = textureImage, r = r, level = level, slice = slice](VkCommandBuffer commandBuffer) {
VkBufferImageCopy region{}; VkBufferImageCopy region{};
region.bufferOffset = 0; region.bufferOffset = 0;
region.bufferRowLength = 0; region.bufferRowLength = 0;
region.bufferImageHeight = 0; region.bufferImageHeight = 0;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.imageSubresource.mipLevel = 0; region.imageSubresource.mipLevel = level;
region.imageSubresource.baseArrayLayer = 0; region.imageSubresource.baseArrayLayer = slice;
region.imageSubresource.layerCount = 1; region.imageSubresource.layerCount = 1;
region.imageOffset = { r.x, r.y, 0 }; region.imageOffset = { r.x, r.y, 0 };
@@ -248,7 +263,7 @@ void Texture::uploadByteData(PixelFormat pixelformat, const void* data, size_t s
static_cast<uint32_t>(r.h), 1 static_cast<uint32_t>(r.h), 1
}; };
Vulkan::cmdTransitionImageLayout(commandBuffer, image, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); Vulkan::cmdTransitionImageLayout(commandBuffer, image, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, level, 1, slice, 1);
vkCmdCopyBufferToImage( vkCmdCopyBufferToImage(
commandBuffer, commandBuffer,
@@ -259,7 +274,7 @@ void Texture::uploadByteData(PixelFormat pixelformat, const void* data, size_t s
&region &region
); );
Vulkan::cmdTransitionImageLayout(commandBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL); Vulkan::cmdTransitionImageLayout(commandBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL, level, 1, slice, 1);
}; };
auto cleanUp = [allocator = allocator, stagingBuffer, vmaAllocation]() { auto cleanUp = [allocator = allocator, stagingBuffer, vmaAllocation]() {
src/modules/graphics/vulkan/Texture.h
+1
View File
@@ -50,6 +50,7 @@ private:
VkImageView textureImageView; VkImageView textureImageView;
VkSampler textureSampler; VkSampler textureSampler;
const Slices* data; const Slices* data;
int layerCount = 0;
}; };
} // vulkan } // vulkan
} // graphics } // graphics
src/modules/graphics/vulkan/Vulkan.cpp
+34 -5
View File
@@ -453,7 +453,36 @@ VkCullModeFlags Vulkan::getCullMode(CullMode cullmode) {
} }
} }
void Vulkan::cmdTransitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout oldLayout, VkImageLayout newLayout) { VkImageType Vulkan::getImageType(TextureType textureType) {
switch (textureType) {
case TEXTURE_2D:
case TEXTURE_2D_ARRAY:
return VK_IMAGE_TYPE_2D;
case TEXTURE_VOLUME:
case TEXTURE_CUBE:
return VK_IMAGE_TYPE_3D;
default:
throw love::Exception("unknown texture type");
}
}
VkImageViewType Vulkan::getImageViewType(TextureType textureType) {
switch (textureType) {
case TEXTURE_2D:
return VK_IMAGE_VIEW_TYPE_2D;
case TEXTURE_2D_ARRAY:
return VK_IMAGE_VIEW_TYPE_2D_ARRAY;
case TEXTURE_CUBE:
return VK_IMAGE_VIEW_TYPE_CUBE;
case TEXTURE_VOLUME:
return VK_IMAGE_VIEW_TYPE_3D;
default:
throw love::Exception("unknown texture type");
}
}
void Vulkan::cmdTransitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout oldLayout, VkImageLayout newLayout,
uint32_t baseLevel, uint32_t levelCount, uint32_t baseLayer, uint32_t layerCount) {
VkImageMemoryBarrier barrier{}; VkImageMemoryBarrier barrier{};
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
barrier.oldLayout = oldLayout; barrier.oldLayout = oldLayout;
@@ -462,10 +491,10 @@ void Vulkan::cmdTransitionImageLayout(VkCommandBuffer commandBuffer, VkImage ima
barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
barrier.image = image; barrier.image = image;
barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.baseMipLevel = baseLevel;
barrier.subresourceRange.levelCount = 1; barrier.subresourceRange.levelCount = levelCount;
barrier.subresourceRange.baseArrayLayer = 0; barrier.subresourceRange.baseArrayLayer = baseLayer;
barrier.subresourceRange.layerCount = 1; barrier.subresourceRange.layerCount = layerCount;
VkPipelineStageFlags sourceStage; VkPipelineStageFlags sourceStage;
VkPipelineStageFlags destinationStage; VkPipelineStageFlags destinationStage;
src/modules/graphics/vulkan/Vulkan.h
+5 -1
View File
@@ -41,8 +41,12 @@ public:
static VkColorComponentFlags getColorMask(ColorChannelMask); static VkColorComponentFlags getColorMask(ColorChannelMask);
static VkFrontFace getFrontFace(Winding); static VkFrontFace getFrontFace(Winding);
static VkCullModeFlags getCullMode(CullMode); static VkCullModeFlags getCullMode(CullMode);
static VkImageType getImageType(TextureType);
static VkImageViewType getImageViewType(TextureType);
static void cmdTransitionImageLayout(VkCommandBuffer, VkImage, VkImageLayout oldLayout, VkImageLayout newLayout); static void cmdTransitionImageLayout(
VkCommandBuffer, VkImage, VkImageLayout oldLayout, VkImageLayout newLayout,
uint32_t baseLevel = 0, uint32_t levelCount = 1, uint32_t baseLayer = 0, uint32_t layerCount = 1);
}; };
} // vulkan } // vulkan
} // graphics } // graphics