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

6
Src/Client/Vulkan/VulkanRenderSession.hpp
View File

@@ -1206,8 +1206,8 @@ class VulkanRenderSession : public IRenderSession {
.binding = 1, .binding = 1,
.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, Данные к атласу .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, Данные к атласу
*/ */
// VkDescriptorSetLayout MainAtlasDescLayout = VK_NULL_HANDLE; VkDescriptorSetLayout MainAtlasDescLayout = VK_NULL_HANDLE;
// VkDescriptorSet MainAtlasDescriptor = VK_NULL_HANDLE; VkDescriptorSet MainAtlasDescriptor = VK_NULL_HANDLE;
/* /*
.binding = 2, .binding = 2,
.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, Воксельная карта освещения .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, Воксельная карта освещения
@@ -1265,4 +1265,4 @@ private:
void updateDescriptor_ChunksLight(); void updateDescriptor_ChunksLight();
}; };
} }

4
Src/Common/Abstract.hpp
View File

@@ -523,6 +523,10 @@ struct TexturePipeline {
std::vector<AssetsTexture> BinTextures; std::vector<AssetsTexture> BinTextures;
// Чистый код текстурных преобразований, локальные идентификаторы связаны с BinTextures // Чистый код текстурных преобразований, локальные идентификаторы связаны с BinTextures
std::u8string Pipeline; std::u8string Pipeline;
bool operator==(const TexturePipeline& other) const {
return BinTextures == other.BinTextures && Pipeline == other.Pipeline;
}
}; };
// Компилятор текстурных потоков // Компилятор текстурных потоков