Skip to content

S
swiftshader
Commit aedd133c by Antonio Maiorano Committed by swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com
Options

VulkanBenchmarks: fix memory leaks

Found these leaks using AppVerifier on Windows. Bug: b/176981107 Change-Id: I89cbfc02e6adf0ea2a54cf80501fbbb3d0867964 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/51748Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com> Commit-Queue: Antonio Maiorano <amaiorano@google.com>
parent 5255c465
Showing with 5 additions and 4 deletions
tests/VulkanBenchmarks/VulkanBenchmarks.cpp
...@@ -783,6 +783,7 @@ public: ...@@ -783,6 +783,7 @@ public:
{ {
delete texture; delete texture;
device.destroyDescriptorSetLayout(descriptorSetLayout);
device.destroyDescriptorPool(descriptorPool); device.destroyDescriptorPool(descriptorPool);
device.destroySampler(sampler, nullptr); device.destroySampler(sampler, nullptr);
...@@ -998,12 +999,12 @@ protected: ...@@ -998,12 +999,12 @@ protected:
vk::MemoryRequirements memoryRequirements = device.getBufferMemoryRequirements(vertices.buffer); vk::MemoryRequirements memoryRequirements = device.getBufferMemoryRequirements(vertices.buffer);
memoryAllocateInfo.allocationSize = memoryRequirements.size; memoryAllocateInfo.allocationSize = memoryRequirements.size;
memoryAllocateInfo.memoryTypeIndex = getMemoryTypeIndex(physicalDevice, memoryRequirements.memoryTypeBits, vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent); memoryAllocateInfo.memoryTypeIndex = getMemoryTypeIndex(physicalDevice, memoryRequirements.memoryTypeBits, vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent);
vk::DeviceMemory vertexBufferMemory = device.allocateMemory(memoryAllocateInfo); vertices.memory = device.allocateMemory(memoryAllocateInfo);
void *data = device.mapMemory(vertexBufferMemory, 0, VK_WHOLE_SIZE); void *data = device.mapMemory(vertices.memory, 0, VK_WHOLE_SIZE);
memcpy(data, vertexBufferData, sizeof(vertexBufferData)); memcpy(data, vertexBufferData, sizeof(vertexBufferData));
device.unmapMemory(vertexBufferMemory); device.unmapMemory(vertices.memory);
device.bindBufferMemory(vertices.buffer, vertexBufferMemory, 0); device.bindBufferMemory(vertices.buffer, vertices.memory, 0);
vertices.inputBinding.binding = 0; vertices.inputBinding.binding = 0;
vertices.inputBinding.stride = sizeof(Vertex); vertices.inputBinding.stride = sizeof(Vertex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment