OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix zminmax not being linear depth

Browse source
This commit is contained in:
Magnus Norddahl 2024-09-16 01:45:44 +02:00
commit 83009db3ec
9 changed files with 54 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
View file

@ -110,7 +110,7 @@ void VkDescriptorSetManager::UpdateLevelMeshSet()
void VkDescriptorSetManager::UpdateLightTilesSet()
{
WriteDescriptors()
.AddStorageImage(LightTiles.Set.get(), 0, fb->GetBuffers()->SceneZMinMax[4].View.get(), VK_IMAGE_LAYOUT_GENERAL)
.AddStorageImage(LightTiles.Set.get(), 0, fb->GetBuffers()->SceneZMinMax[5].View.get(), VK_IMAGE_LAYOUT_GENERAL)
.AddBuffer(LightTiles.Set.get(), 1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, fb->GetLevelMesh()->GetUniformsBuffer())
.AddBuffer(LightTiles.Set.get(), 2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, fb->GetBuffers()->SceneLightTiles.get())
.Execute(fb->GetDevice());
@ -122,7 +122,7 @@ void VkDescriptorSetManager::UpdateZMinMaxSet()
.AddCombinedImageSampler(ZMinMax.Set[0].get(), 0, fb->GetBuffers()->SceneDepthStencil.DepthOnlyView.get(), fb->GetSamplerManager()->ZMinMaxSampler.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
.Execute(fb->GetDevice());
for (int i = 1; i < 5; i++)
for (int i = 1; i < 6; i++)
{
WriteDescriptors()
.AddCombinedImageSampler(ZMinMax.Set[i].get(), 0, fb->GetBuffers()->SceneZMinMax[i - 1].View.get(), fb->GetSamplerManager()->ZMinMaxSampler.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
@ -314,8 +314,8 @@ void VkDescriptorSetManager::CreateLightTilesPool()
void VkDescriptorSetManager::CreateZMinMaxPool()
{
ZMinMax.Pool = DescriptorPoolBuilder()
.AddPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 5)
.MaxSets(5)
.AddPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6)
.MaxSets(6)
.DebugName("VkDescriptorSetManager.ZMinMax.Pool")
.Create(fb->GetDevice());
}

2
src/common/rendering/vulkan/descriptorsets/vk_descriptorset.h
View file

@ -110,7 +110,7 @@ private:
struct
{
std::unique_ptr<VulkanDescriptorPool> Pool;
std::unique_ptr<VulkanDescriptorSet> Set[5];
std::unique_ptr<VulkanDescriptorSet> Set[6];
std::unique_ptr<VulkanDescriptorSetLayout> Layout;
} ZMinMax;