zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-01 22:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- bind a texture in all descriptor slots

Browse source
This commit is contained in:
Magnus Norddahl 2019-03-17 23:24:50 +01:00
parent ec7a874a61
commit b62d5784af
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rendering/vulkan/textures/vk_hwtexture.cpp
View file

@ -121,14 +121,22 @@ VulkanDescriptorSet *VkHardwareTexture::GetDescriptorSet(const FMaterialState &s
VulkanSampler *sampler = fb->GetSamplerManager()->Get(clampmode); VulkanSampler *sampler = fb->GetSamplerManager()->Get(clampmode);
int numLayers = mat->GetLayers(); int numLayers = mat->GetLayers();
int maxTextures = 6;
auto baseView = GetImageView(tex, translation, flags);
numLayers = clamp(numLayers, 1, maxTextures);
WriteDescriptors update; WriteDescriptors update;
update.addCombinedImageSampler(descriptorSet.get(), 0, GetImageView(tex, translation, flags), sampler, mImageLayout); update.addCombinedImageSampler(descriptorSet.get(), 0, baseView, sampler, mImageLayout);
for (int i = 1; i < numLayers; i++) for (int i = 1; i < numLayers; i++)
{ {
FTexture *layer; FTexture *layer;
auto systex = static_cast<VkHardwareTexture*>(mat->GetLayer(i, 0, &layer)); auto systex = static_cast<VkHardwareTexture*>(mat->GetLayer(i, 0, &layer));
update.addCombinedImageSampler(descriptorSet.get(), i, systex->GetImageView(layer, 0, mat->isExpanded() ? CTF_Expand : 0), sampler, systex->mImageLayout); update.addCombinedImageSampler(descriptorSet.get(), i, systex->GetImageView(layer, 0, mat->isExpanded() ? CTF_Expand : 0), sampler, systex->mImageLayout);
} }
for (int i = numLayers; i < maxTextures; i++)
{
update.addCombinedImageSampler(descriptorSet.get(), i, baseView, sampler, mImageLayout);
}
update.updateSets(fb->device); update.updateSets(fb->device);
} }