OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/meta: Clean up temporary objects

Browse Source
This commit is contained in:
Jason Ekstrand
2015-06-09 11:08:51 -07:00
parent 9d6f55dedf
commit 3a38b0db5f
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vulkan/device.c
View File

@@ -410,6 +410,7 @@ VkResult anv_DestroyDevice(
anv_compiler_destroy(device->compiler);
anv_device_finish_meta(device);
anv_bo_pool_finish(&device->batch_bo_pool);
anv_block_pool_finish(&device->dynamic_state_block_pool);

51
src/vulkan/meta.c
View File

@@ -411,15 +411,13 @@ anv_device_init_meta_blit_state(struct anv_device *device)
anv_CreateDescriptorSetLayout((VkDevice) device, &ds_layout_info,
&device->meta_state.blit.ds_layout);
VkPipelineLayoutCreateInfo pipeline_layout_info = {
anv_CreatePipelineLayout((VkDevice) device,
&(VkPipelineLayoutCreateInfo) {
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
.descriptorSetCount = 1,
.pSetLayouts = &device->meta_state.blit.ds_layout,
};
VkPipelineLayout pipeline_layout;
anv_CreatePipelineLayout((VkDevice) device, &pipeline_layout_info,
&pipeline_layout);
},
&device->meta_state.blit.pipeline_layout);
VkPipelineRsStateCreateInfo rs_create_info = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO,
@@ -445,7 +443,7 @@ anv_device_init_meta_blit_state(struct anv_device *device)
.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
.pNext = &cb_create_info,
.flags = 0,
.layout = pipeline_layout,
.layout = device->meta_state.blit.pipeline_layout,
};
anv_pipeline_create((VkDevice) device, &pipeline_info,
@@ -647,6 +645,14 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer,
anv_CmdDraw((VkCmdBuffer) cmd_buffer, 0, 3, 0, 1);
anv_CmdEndRenderPass((VkCmdBuffer) cmd_buffer, pass);
/* At the point where we emit the draw call, all data from the
* descriptor sets, etc. has been used. We are free to delete it.
*/
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_DESCRIPTOR_SET, set);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_FRAMEBUFFER,
(VkFramebuffer) fb);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_RENDER_PASS, pass);
}
static void
@@ -756,6 +762,9 @@ do_buffer_copy(struct anv_cmd_buffer *cmd_buffer,
&dest_view,
(VkOffset3D) { 0, 0, 0 },
(VkExtent3D) { width, height, 1 });
anv_DestroyObject(vk_device, VK_OBJECT_TYPE_IMAGE, (VkImage) src_image);
anv_DestroyObject(vk_device, VK_OBJECT_TYPE_IMAGE, (VkImage) dest_image);
}
void anv_CmdCopyBuffer(
@@ -1049,6 +1058,8 @@ void anv_CmdCopyBufferToImage(
&dest_view,
pRegions[r].imageOffset,
pRegions[r].imageExtent);
anv_DestroyObject(vk_device, VK_OBJECT_TYPE_IMAGE, (VkImage) src_image);
}
meta_finish_blit(cmd_buffer, &saved_state);
@@ -1139,6 +1150,8 @@ void anv_CmdCopyImageToBuffer(
&dest_view,
(VkOffset3D) { 0, 0, 0 },
pRegions[r].imageExtent);
anv_DestroyObject(vk_device, VK_OBJECT_TYPE_IMAGE, (VkImage) dest_image);
}
meta_finish_blit(cmd_buffer, &saved_state);
@@ -1233,3 +1246,27 @@ anv_device_init_meta(struct anv_device *device)
},
&device->meta_state.shared.ds_state);
}
void
anv_device_finish_meta(struct anv_device *device)
{
/* Clear */
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_PIPELINE,
device->meta_state.clear.pipeline);
/* Blit */
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_PIPELINE,
device->meta_state.blit.pipeline);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_PIPELINE_LAYOUT,
device->meta_state.blit.pipeline_layout);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT,
device->meta_state.blit.ds_layout);
/* Shared */
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_DYNAMIC_RS_STATE,
device->meta_state.shared.rs_state);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_DYNAMIC_CB_STATE,
device->meta_state.shared.cb_state);
anv_DestroyObject((VkDevice) device, VK_OBJECT_TYPE_DYNAMIC_DS_STATE,
device->meta_state.shared.ds_state);
}

2
src/vulkan/private.h
View File

@@ -302,6 +302,7 @@ struct anv_meta_state {
struct {
VkPipeline pipeline;
VkPipelineLayout pipeline_layout;
VkDescriptorSetLayout ds_layout;
} blit;
@@ -832,6 +833,7 @@ struct anv_render_pass {
};
void anv_device_init_meta(struct anv_device *device);
void anv_device_finish_meta(struct anv_device *device);
void
anv_cmd_buffer_clear(struct anv_cmd_buffer *cmd_buffer,