claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #936 from jonnxie/master

Browse source 
Fixed GLTF memory leak
This commit is contained in:
Sascha Willems 2022-03-24 21:24:22 +01:00 • committed by GitHub
commit 4b8c2d39c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base/VulkanglTFModel.cpp
View file

@ -499,6 +499,10 @@ vkglTF::Mesh::Mesh(vks::VulkanDevice *device, glm::mat4 matrix) {
vkglTF::Mesh::~Mesh() { vkglTF::Mesh::~Mesh() {
vkDestroyBuffer(device->logicalDevice, uniformBuffer.buffer, nullptr); vkDestroyBuffer(device->logicalDevice, uniformBuffer.buffer, nullptr);
vkFreeMemory(device->logicalDevice, uniformBuffer.memory, nullptr); vkFreeMemory(device->logicalDevice, uniformBuffer.memory, nullptr);
for(auto primitive : primitives)
{
delete primitive;
}
} }
/* /*
@ -735,6 +739,9 @@ vkglTF::Model::~Model()
for (auto node : nodes) { for (auto node : nodes) {
delete node; delete node;
} }
for (auto skin : skins) {
delete skin;
}
if (descriptorSetLayoutUbo != VK_NULL_HANDLE) { if (descriptorSetLayoutUbo != VK_NULL_HANDLE) {
vkDestroyDescriptorSetLayout(device->logicalDevice, descriptorSetLayoutUbo, nullptr); vkDestroyDescriptorSetLayout(device->logicalDevice, descriptorSetLayoutUbo, nullptr);
descriptorSetLayoutUbo = VK_NULL_HANDLE; descriptorSetLayoutUbo = VK_NULL_HANDLE;
@ -906,6 +913,7 @@ void vkglTF::Model::loadNode(vkglTF::Node *parent, const tinygltf::Node &node, u
for (size_t index = 0; index < accessor.count; index++) { for (size_t index = 0; index < accessor.count; index++) {
indexBuffer.push_back(buf[index] + vertexStart); indexBuffer.push_back(buf[index] + vertexStart);
} }
delete[] buf;
break; break;
} }
case TINYGLTF_PARAMETER_TYPE_UNSIGNED_SHORT: { case TINYGLTF_PARAMETER_TYPE_UNSIGNED_SHORT: {
@ -914,7 +922,8 @@ void vkglTF::Model::loadNode(vkglTF::Node *parent, const tinygltf::Node &node, u
for (size_t index = 0; index < accessor.count; index++) { for (size_t index = 0; index < accessor.count; index++) {
indexBuffer.push_back(buf[index] + vertexStart); indexBuffer.push_back(buf[index] + vertexStart);
} }
break; delete[] buf;
break;
} }
case TINYGLTF_PARAMETER_TYPE_UNSIGNED_BYTE: { case TINYGLTF_PARAMETER_TYPE_UNSIGNED_BYTE: {
uint8_t *buf = new uint8_t[accessor.count]; uint8_t *buf = new uint8_t[accessor.count];
@ -922,7 +931,8 @@ void vkglTF::Model::loadNode(vkglTF::Node *parent, const tinygltf::Node &node, u
for (size_t index = 0; index < accessor.count; index++) { for (size_t index = 0; index < accessor.count; index++) {
indexBuffer.push_back(buf[index] + vertexStart); indexBuffer.push_back(buf[index] + vertexStart);
} }
break; delete[] buf;
break;
} }
default: default:
std::cerr << "Index component type " << accessor.componentType << " not supported!" << std::endl; std::cerr << "Index component type " << accessor.componentType << " not supported!" << std::endl;