DrSocalkwe3n/LuaVox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Правка для работы после предыдущего коммита

Browse Source
This commit is contained in:
DrSocalkwe3n
2025-12-31 16:39:44 +06:00
parent b1bc2c8e74
commit 347844251e
3 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Src/Client/Vulkan/VulkanRenderSession.cpp
View File

@@ -849,49 +849,49 @@ VulkanRenderSession::VulkanRenderSession(Vulkan *vkInst, IServerSession *serverS
&DescriptorPool));
}
// {
// std::vector<VkDescriptorSetLayoutBinding> shaderLayoutBindings =
// {
// {
// .binding = 0,
// .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
// .descriptorCount = 1,
// .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
// .pImmutableSamplers = nullptr
// }, {
// .binding = 1,
// .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
// .descriptorCount = 1,
// .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
// .pImmutableSamplers = nullptr
// }
// };
{
std::vector<VkDescriptorSetLayoutBinding> shaderLayoutBindings =
{
{
.binding = 0,
.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
.descriptorCount = 1,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.pImmutableSamplers = nullptr
}, {
.binding = 1,
.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
.descriptorCount = 1,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.pImmutableSamplers = nullptr
}
};
// const VkDescriptorSetLayoutCreateInfo descriptorLayout =
// {
// .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
// .pNext = nullptr,
// .flags = 0,
// .bindingCount = (uint32_t) shaderLayoutBindings.size(),
// .pBindings = shaderLayoutBindings.data()
// };
const VkDescriptorSetLayoutCreateInfo descriptorLayout =
{
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
.pNext = nullptr,
.flags = 0,
.bindingCount = (uint32_t) shaderLayoutBindings.size(),
.pBindings = shaderLayoutBindings.data()
};
// vkAssert(!vkCreateDescriptorSetLayout(
// VkInst->Graphics.Device, &descriptorLayout, nullptr, &MainAtlasDescLayout));
// }
vkAssert(!vkCreateDescriptorSetLayout(
VkInst->Graphics.Device, &descriptorLayout, nullptr, &MainAtlasDescLayout));
}
// {
// VkDescriptorSetAllocateInfo ciAllocInfo =
// {
// .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
// .pNext = nullptr,
// .descriptorPool = DescriptorPool,
// .descriptorSetCount = 1,
// .pSetLayouts = &MainAtlasDescLayout
// };
{
VkDescriptorSetAllocateInfo ciAllocInfo =
{
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.pNext = nullptr,
.descriptorPool = DescriptorPool,
.descriptorSetCount = 1,
.pSetLayouts = &MainAtlasDescLayout
};
// vkAssert(!vkAllocateDescriptorSets(VkInst->Graphics.Device, &ciAllocInfo, &MainAtlasDescriptor));
// }
vkAssert(!vkAllocateDescriptorSets(VkInst->Graphics.Device, &ciAllocInfo, &MainAtlasDescriptor));
}
{
std::vector<VkDescriptorSetLayoutBinding> shaderLayoutBindings =
@@ -1434,8 +1434,8 @@ VulkanRenderSession::~VulkanRenderSession() {
if(MainAtlas_LightMap_PipelineLayout)
vkDestroyPipelineLayout(VkInst->Graphics.Device, MainAtlas_LightMap_PipelineLayout, nullptr);
// if(MainAtlasDescLayout)
// vkDestroyDescriptorSetLayout(VkInst->Graphics.Device, MainAtlasDescLayout, nullptr);
if(MainAtlasDescLayout)
vkDestroyDescriptorSetLayout(VkInst->Graphics.Device, MainAtlasDescLayout, nullptr);
if(VoxelLightMapDescLayout)
vkDestroyDescriptorSetLayout(VkInst->Graphics.Device, VoxelLightMapDescLayout, nullptr);
@@ -1853,4 +1853,4 @@ void VulkanRenderSession::updateDescriptor_ChunksLight() {
}
}
}