Skip to content

fix: memory leak #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Varnill wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: memory leak #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/graphics/vulkan/pipelines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ VkPipelineLayout GLTFMetallic_Roughness::create_pipeline_layout(
matrixRange.size = sizeof(GPUDrawPushConstants);
matrixRange.stageFlags = VK_SHADER_STAGE_VERTEX_BIT;

VkDescriptorSetLayout layouts[] = {engine->_gpuSceneDataDescriptorLayout,
VkDescriptorSetLayout layouts[] = {engine->_gpuSceneDataDescriptorLayout.set,
materialLayout};
VkPipelineLayoutCreateInfo mesh_layout_info =
vkinit::pipeline_layout_create_info();
Expand Down
21 changes: 18 additions & 3 deletions src/include/graphics/vulkan/vk_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,22 @@ class VulkanEngine {
DescriptorAllocatorGrowable globalDescriptorAllocator;

VkDescriptorSet _drawImageDescriptors;
VkDescriptorSetLayout _drawImageDescriptorLayout;
struct DescriptorSetLayout {
VkDescriptorSetLayout set{VK_NULL_HANDLE};
VkDevice device{VK_NULL_HANDLE};
void create(const VkDevice pDevice,
const VkShaderStageFlags pShaderStages,
const VkDescriptorType pType) {
device = pDevice;
DescriptorLayoutBuilder builder;
builder.add_binding(0, pType);
set = builder.build(pDevice, pShaderStages);
}
~DescriptorSetLayout() {
vkDestroyDescriptorSetLayout(device, set, nullptr);
}
};
DescriptorSetLayout _drawImageDescriptorLayout;


GPUMeshBuffers rectangle;
Expand All @@ -154,7 +169,7 @@ class VulkanEngine {

GPUSceneData sceneData;

VkDescriptorSetLayout _gpuSceneDataDescriptorLayout;
DescriptorSetLayout _gpuSceneDataDescriptorLayout;

AllocatedImage create_image(VkExtent3D size, VkFormat format,
VkImageUsageFlags usage,
Expand All @@ -172,7 +187,7 @@ class VulkanEngine {
VkSampler _defaultSamplerLinear;
VkSampler _defaultSamplerNearest;

VkDescriptorSetLayout _singleImageDescriptorLayout;
DescriptorSetLayout _singleImageDescriptorLayout;

MaterialInstance defaultData;
GLTFMetallic_Roughness metalRoughMaterial;
Expand Down
Loading