OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix upload of prefilterred maps

Browse source
This commit is contained in:
RaveYard 2025-02-17 02:05:51 +01:00 • committed by Magnus Norddahl
commit 08f41596be
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/common/rendering/vulkan/textures/vk_texture.cpp
View file

@ -367,22 +367,26 @@ void VkTextureManager::CreatePrefiltermap(int size, int count, TArray<uint16_t>&
.Execute(cmdbuffer);
int offset = 0;
for (int level = 0; level < miplevels; level++)
for (int i = 0; i < 6; ++i)
{
int mipwidth = std::max(w >> level, 1);
int mipheight = std::max(h >> level, 1);
for (int level = 0; level < miplevels; level++)
{
int mipwidth = std::max(w >> level, 1);
int mipheight = std::max(h >> level, 1);
VkBufferImageCopy region = {};
region.bufferOffset = offset;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.imageSubresource.layerCount = count;
region.imageSubresource.mipLevel = level;
region.imageExtent.depth = 1;
region.imageExtent.width = mipwidth;
region.imageExtent.height = mipheight;
cmdbuffer->copyBufferToImage(stagingBuffer->buffer, Prefiltermap.Image.Image->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
VkBufferImageCopy region = {};
region.bufferOffset = offset;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.imageSubresource.layerCount = 1;
region.imageSubresource.baseArrayLayer = i;
region.imageSubresource.mipLevel = level;
region.imageExtent.depth = 1;
region.imageExtent.width = mipwidth;
region.imageExtent.height = mipheight;
cmdbuffer->copyBufferToImage(stagingBuffer->buffer, Prefiltermap.Image.Image->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
offset += mipwidth * mipheight * count * pixelsize;
offset += mipwidth * mipheight * pixelsize;
}
}
fb->GetCommands()->TransferDeleteList->Add(std::move(stagingBuffer));

6
src/common/rendering/vulkan/vk_lightprober.cpp
View file

@ -377,11 +377,11 @@ void VkLightprober::CreatePrefilterMap()
.MaxSets(6 * prefilterMap.maxlevels)
.Create(fb->GetDevice());
for (int level = 0; level < prefilterMap.maxlevels; level++)
for (int i = 0; i < 6; i++)
{
for (int i = 0; i < 6; i++)
for (int level = 0; level < prefilterMap.maxlevels; level++)
{
int idx = level * 6 + i;
int idx = i * prefilterMap.maxlevels + level;
prefilterMap.images[idx] = ImageBuilder()
.Size(128 >> level, 128 >> level)