From d8a300cedfa2c751c0f68a942a65370d7327e2fb Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Thu, 5 Dec 2024 18:47:15 -0600 Subject: [PATCH] comp: Normalize naming (fini) Part-of: --- src/xrt/compositor/main/comp_compositor.c | 4 ++-- src/xrt/compositor/main/comp_renderer.c | 8 +++---- src/xrt/compositor/render/render_buffer.c | 2 +- src/xrt/compositor/render/render_distortion.c | 14 +++++------ src/xrt/compositor/render/render_gfx.c | 4 ++-- src/xrt/compositor/render/render_interface.h | 15 ++++++------ src/xrt/compositor/render/render_resources.c | 24 +++++++++---------- src/xrt/compositor/render/render_shaders.c | 4 ++-- 8 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c index a4cbe9707..9dea8abc1 100644 --- a/src/xrt/compositor/main/comp_compositor.c +++ b/src/xrt/compositor/main/comp_compositor.c @@ -415,10 +415,10 @@ compositor_destroy(struct xrt_compositor *xc) comp_target_destroy(&c->target); // Only depends on vk_bundle and shaders. - render_resources_close(&c->nr); + render_resources_fini(&c->nr); // As long as vk_bundle is valid it's safe to call this function. - render_shaders_close(&c->shaders, vk); + render_shaders_fini(&c->shaders, vk); if (vk->device != VK_NULL_HANDLE) { vk->vkDestroyDevice(vk->device, NULL); diff --git a/src/xrt/compositor/main/comp_renderer.c b/src/xrt/compositor/main/comp_renderer.c index 58ad49f75..412274a2a 100644 --- a/src/xrt/compositor/main/comp_renderer.c +++ b/src/xrt/compositor/main/comp_renderer.c @@ -437,11 +437,11 @@ renderer_close_renderings_and_fences(struct comp_renderer *r) // Renderings if (r->buffer_count > 0 && r->rtr_array != NULL) { for (uint32_t i = 0; i < r->buffer_count; i++) { - render_gfx_target_resources_close(&r->rtr_array[i]); + render_gfx_target_resources_fini(&r->rtr_array[i]); } // Close the render pass used for rendering to the target. - render_gfx_render_pass_close(&r->target_render_pass); + render_gfx_render_pass_fini(&r->target_render_pass); free(r->rtr_array); r->rtr_array = NULL; @@ -825,12 +825,12 @@ renderer_fini(struct comp_renderer *r) // Do this after the layer renderer. for (uint32_t i = 0; i < r->c->nr.view_count; i++) { for (uint32_t k = 0; k < COMP_SCRATCH_NUM_IMAGES; k++) { - render_gfx_target_resources_close(&r->scratch.views[i].targets[k]); + render_gfx_target_resources_fini(&r->scratch.views[i].targets[k]); } } // Do this after the layer renderer and targert resources. - render_gfx_render_pass_close(&r->scratch_render_pass); + render_gfx_render_pass_fini(&r->scratch_render_pass); } diff --git a/src/xrt/compositor/render/render_buffer.c b/src/xrt/compositor/render/render_buffer.c index 1f25b55e4..0dbf6b451 100644 --- a/src/xrt/compositor/render/render_buffer.c +++ b/src/xrt/compositor/render/render_buffer.c @@ -178,7 +178,7 @@ render_buffer_init_exportable(struct vk_bundle *vk, } void -render_buffer_close(struct vk_bundle *vk, struct render_buffer *buffer) +render_buffer_fini(struct vk_bundle *vk, struct render_buffer *buffer) { D(Buffer, buffer->buffer); DF(Memory, buffer->memory); diff --git a/src/xrt/compositor/render/render_distortion.c b/src/xrt/compositor/render/render_distortion.c index 031f74ad5..d695832d0 100644 --- a/src/xrt/compositor/render/render_distortion.c +++ b/src/xrt/compositor/render/render_distortion.c @@ -272,9 +272,9 @@ create_and_fill_in_distortion_buffer_for_view(struct vk_bundle *vk, return VK_SUCCESS; err_buffers: - render_buffer_close(vk, r_buffer); - render_buffer_close(vk, g_buffer); - render_buffer_close(vk, b_buffer); + render_buffer_fini(vk, r_buffer); + render_buffer_fini(vk, g_buffer); + render_buffer_fini(vk, b_buffer); return ret; } @@ -359,7 +359,7 @@ render_distortion_buffer_init(struct render_resources *r, */ for (uint32_t i = 0; i < RENDER_DISTORTION_IMAGES_COUNT; i++) { - render_buffer_close(vk, &bufs[i]); + render_buffer_fini(vk, &bufs[i]); } return true; @@ -376,7 +376,7 @@ err_resources: D(ImageView, image_views[i]); D(Image, images[i]); DF(Memory, device_memories[i]); - render_buffer_close(vk, &bufs[i]); + render_buffer_fini(vk, &bufs[i]); } return false; @@ -390,7 +390,7 @@ err_resources: */ void -render_distortion_images_close(struct render_resources *r) +render_distortion_images_fini(struct render_resources *r) { struct vk_bundle *vk = r->vk; @@ -408,7 +408,7 @@ render_distortion_images_ensure(struct render_resources *r, bool pre_rotate) { if (r->distortion.image_views[0] == VK_NULL_HANDLE || pre_rotate != r->distortion.pre_rotated) { - render_distortion_images_close(r); + render_distortion_images_fini(r); return render_distortion_buffer_init(r, vk, xdev, pre_rotate); } diff --git a/src/xrt/compositor/render/render_gfx.c b/src/xrt/compositor/render/render_gfx.c index 5ee771ed4..b13dcb4db 100644 --- a/src/xrt/compositor/render/render_gfx.c +++ b/src/xrt/compositor/render/render_gfx.c @@ -884,7 +884,7 @@ render_gfx_render_pass_init(struct render_gfx_render_pass *rgrp, } void -render_gfx_render_pass_close(struct render_gfx_render_pass *rgrp) +render_gfx_render_pass_fini(struct render_gfx_render_pass *rgrp) { struct vk_bundle *vk = rgrp->r->vk; @@ -940,7 +940,7 @@ render_gfx_target_resources_init(struct render_gfx_target_resources *rtr, } void -render_gfx_target_resources_close(struct render_gfx_target_resources *rtr) +render_gfx_target_resources_fini(struct render_gfx_target_resources *rtr) { struct vk_bundle *vk = vk_from_rtr(rtr); diff --git a/src/xrt/compositor/render/render_interface.h b/src/xrt/compositor/render/render_interface.h index b735411ff..ef024e09c 100644 --- a/src/xrt/compositor/render/render_interface.h +++ b/src/xrt/compositor/render/render_interface.h @@ -168,7 +168,7 @@ render_shaders_load(struct render_shaders *s, struct vk_bundle *vk); * Unload and cleanup shaders. */ void -render_shaders_close(struct render_shaders *s, struct vk_bundle *vk); +render_shaders_fini(struct render_shaders *s, struct vk_bundle *vk); /* @@ -224,7 +224,7 @@ render_buffer_init_exportable(struct vk_bundle *vk, * Frees all resources that this buffer has, but does not free the buffer itself. */ void -render_buffer_close(struct vk_bundle *vk, struct render_buffer *buffer); +render_buffer_fini(struct vk_bundle *vk, struct render_buffer *buffer); /*! * Maps the memory, sets render_buffer::mapped to the memory. @@ -575,11 +575,12 @@ render_resources_init(struct render_resources *r, * @public @memberof render_resources */ void -render_resources_close(struct render_resources *r); +render_resources_fini(struct render_resources *r); /*! * Creates or recreates the compute distortion textures if necessary. * + * @see render_distortion_images_fini * @public @memberof render_resources */ bool @@ -595,7 +596,7 @@ render_distortion_images_ensure(struct render_resources *r, * @public @memberof render_resources */ void -render_distortion_images_close(struct render_resources *r); +render_distortion_images_fini(struct render_resources *r); /*! * Returns the timestamps for when the latest GPU work started and stopped that @@ -670,7 +671,7 @@ render_scratch_images_ensure(struct render_resources *r, struct render_scratch_i * @public @memberof render_scratch_images */ void -render_scratch_images_close(struct render_resources *r, struct render_scratch_images *rsi); +render_scratch_images_fini(struct render_resources *r, struct render_scratch_images *rsi); /* @@ -763,7 +764,7 @@ render_gfx_render_pass_init(struct render_gfx_render_pass *rgrp, * @public @memberof render_gfx_render_pass */ void -render_gfx_render_pass_close(struct render_gfx_render_pass *rgrp); +render_gfx_render_pass_fini(struct render_gfx_render_pass *rgrp); /* @@ -813,7 +814,7 @@ render_gfx_target_resources_init(struct render_gfx_target_resources *rtr, * @public @memberof render_gfx_target_resources */ void -render_gfx_target_resources_close(struct render_gfx_target_resources *rtr); +render_gfx_target_resources_fini(struct render_gfx_target_resources *rtr); /* diff --git a/src/xrt/compositor/render/render_resources.c b/src/xrt/compositor/render/render_resources.c index 959685794..4dc515738 100644 --- a/src/xrt/compositor/render/render_resources.c +++ b/src/xrt/compositor/render/render_resources.c @@ -1083,7 +1083,7 @@ render_resources_init(struct render_resources *r, } void -render_resources_close(struct render_resources *r) +render_resources_fini(struct render_resources *r) { // We were never initialised or already closed, always safe to call this function. if (r->vk == NULL) { @@ -1101,7 +1101,7 @@ render_resources_close(struct render_resources *r) D(Image, r->mock.color.image); DF(Memory, r->mock.color.memory); - render_buffer_close(vk, &r->gfx.shared_ubo); + render_buffer_fini(vk, &r->gfx.shared_ubo); D(DescriptorPool, r->gfx.ubo_and_src_descriptor_pool); D(DescriptorSetLayout, r->gfx.layer.shared.descriptor_set_layout); @@ -1111,10 +1111,10 @@ render_resources_close(struct render_resources *r) D(PipelineLayout, r->mesh.pipeline_layout); D(PipelineCache, r->pipeline_cache); D(QueryPool, r->query_pool); - render_buffer_close(vk, &r->mesh.vbo); - render_buffer_close(vk, &r->mesh.ibo); + render_buffer_fini(vk, &r->mesh.vbo); + render_buffer_fini(vk, &r->mesh.ibo); for (uint32_t i = 0; i < r->view_count; ++i) { - render_buffer_close(vk, &r->mesh.ubos[i]); + render_buffer_fini(vk, &r->mesh.ubos[i]); } D(DescriptorPool, r->compute.descriptor_pool); @@ -1131,12 +1131,12 @@ render_resources_close(struct render_resources *r) D(Pipeline, r->compute.clear.pipeline); - render_distortion_images_close(r); - render_buffer_close(vk, &r->compute.clear.ubo); + render_distortion_images_fini(r); + render_buffer_fini(vk, &r->compute.clear.ubo); for (uint32_t i = 0; i < r->view_count; i++) { - render_buffer_close(vk, &r->compute.layer.ubos[i]); + render_buffer_fini(vk, &r->compute.layer.ubos[i]); } - render_buffer_close(vk, &r->compute.distortion.ubo); + render_buffer_fini(vk, &r->compute.distortion.ubo); vk_cmd_pool_destroy(vk, &r->distortion_pool); D(CommandPool, r->cmd_pool); @@ -1255,7 +1255,7 @@ render_scratch_images_ensure(struct render_resources *r, struct render_scratch_i return true; } - render_scratch_images_close(r, rsi); + render_scratch_images_fini(r, rsi); for (uint32_t i = 0; i < r->view_count; i++) { bret = create_scratch_image_and_view( // @@ -1268,7 +1268,7 @@ render_scratch_images_ensure(struct render_resources *r, struct render_scratch_i } if (!bret) { - render_scratch_images_close(r, rsi); + render_scratch_images_fini(r, rsi); return false; } @@ -1278,7 +1278,7 @@ render_scratch_images_ensure(struct render_resources *r, struct render_scratch_i } void -render_scratch_images_close(struct render_resources *r, struct render_scratch_images *rsi) +render_scratch_images_fini(struct render_resources *r, struct render_scratch_images *rsi) { struct vk_bundle *vk = r->vk; diff --git a/src/xrt/compositor/render/render_shaders.c b/src/xrt/compositor/render/render_shaders.c index 12a66b533..b6bae2690 100644 --- a/src/xrt/compositor/render/render_shaders.c +++ b/src/xrt/compositor/render/render_shaders.c @@ -61,7 +61,7 @@ &s->SHADER); /* out */ \ if (ret != VK_SUCCESS) { \ VK_ERROR(vk, "Failed to load shader '" #SHADER "'"); \ - render_shaders_close(s, vk); \ + render_shaders_fini(s, vk); \ return false; \ } \ VK_NAME_SHADER_MODULE(vk, s->SHADER, #SHADER); \ @@ -126,7 +126,7 @@ render_shaders_load(struct render_shaders *s, struct vk_bundle *vk) } void -render_shaders_close(struct render_shaders *s, struct vk_bundle *vk) +render_shaders_fini(struct render_shaders *s, struct vk_bundle *vk) { D(ShaderModule, s->blit_comp); D(ShaderModule, s->clear_comp);