mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-21 06:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xrt: Make some fields on xrt_vk_swapchain private

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-07-10 10:08:23 +01:00 committed by Jakob Bornecrantz
parent f18c190eaa
commit 34843c3ffe
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/xrt/compositor/client/comp_vk_client.c
View file

@ -57,10 +57,9 @@ client_vk_swapchain_destroy(struct xrt_swapchain *xsc)
sc->base.images[i] = VK_NULL_HANDLE; sc->base.images[i] = VK_NULL_HANDLE;
} }
if (sc->base.mems[i] != VK_NULL_HANDLE) { if (sc->mems[i] != VK_NULL_HANDLE) {
c->vk.vkFreeMemory(c->vk.device, sc->base.mems[i], c->vk.vkFreeMemory(c->vk.device, sc->mems[i], NULL);
NULL); sc->mems[i] = VK_NULL_HANDLE;
sc->base.mems[i] = VK_NULL_HANDLE;
} }
} }
@ -88,7 +87,7 @@ client_vk_swapchain_acquire_image(struct xrt_swapchain *xsc,
VkSubmitInfo submitInfo = { VkSubmitInfo submitInfo = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &sc->base.acquire[*out_index], .pCommandBuffers = &sc->acquire[*out_index],
}; };
VkResult ret = VkResult ret =
vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE); vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE);
@ -120,7 +119,7 @@ client_vk_swapchain_release_image(struct xrt_swapchain *xsc, uint32_t index)
VkSubmitInfo submitInfo = { VkSubmitInfo submitInfo = {
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &sc->base.release[index], .pCommandBuffers = &sc->release[index],
}; };
VkResult ret = VkResult ret =
vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE); vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE);
@ -329,7 +328,7 @@ client_vk_swapchain_create(struct xrt_compositor *xc,
ret = vk_create_image_from_native( ret = vk_create_image_from_native(
&c->vk, info->bits, info->format, info->width, info->height, &c->vk, info->bits, info->format, info->width, info->height,
info->array_size, info->mip_count, &xscn->images[i], info->array_size, info->mip_count, &xscn->images[i],
&sc->base.images[i], &sc->base.mems[i]); &sc->base.images[i], &sc->mems[i]);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
@ -356,11 +355,11 @@ client_vk_swapchain_create(struct xrt_compositor *xc,
// Prerecord command buffers for swapchain image ownership/layout // Prerecord command buffers for swapchain image ownership/layout
// transitions // transitions
for (uint32_t i = 0; i < xsc->num_images; i++) { for (uint32_t i = 0; i < xsc->num_images; i++) {
ret = vk_init_cmd_buffer(&c->vk, &sc->base.acquire[i]); ret = vk_init_cmd_buffer(&c->vk, &sc->acquire[i]);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
return NULL; return NULL;
} }
ret = vk_init_cmd_buffer(&c->vk, &sc->base.release[i]); ret = vk_init_cmd_buffer(&c->vk, &sc->release[i]);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
return NULL; return NULL;
} }
@ -414,22 +413,22 @@ client_vk_swapchain_create(struct xrt_compositor *xc,
}; };
//! @todo less conservative pipeline stage masks based on usage //! @todo less conservative pipeline stage masks based on usage
c->vk.vkCmdPipelineBarrier(sc->base.acquire[i], c->vk.vkCmdPipelineBarrier(sc->acquire[i],
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
0, 0, NULL, 0, NULL, 1, &acquire); 0, 0, NULL, 0, NULL, 1, &acquire);
c->vk.vkCmdPipelineBarrier(sc->base.release[i], c->vk.vkCmdPipelineBarrier(sc->release[i],
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
0, 0, NULL, 0, NULL, 1, &release); 0, 0, NULL, 0, NULL, 1, &release);
ret = c->vk.vkEndCommandBuffer(sc->base.acquire[i]); ret = c->vk.vkEndCommandBuffer(sc->acquire[i]);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
VK_ERROR(vk, "vkEndCommandBuffer: %s", VK_ERROR(vk, "vkEndCommandBuffer: %s",
vk_result_string(ret)); vk_result_string(ret));
return NULL; return NULL;
} }
ret = c->vk.vkEndCommandBuffer(sc->base.release[i]); ret = c->vk.vkEndCommandBuffer(sc->release[i]);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
VK_ERROR(vk, "vkEndCommandBuffer: %s", VK_ERROR(vk, "vkEndCommandBuffer: %s",
vk_result_string(ret)); vk_result_string(ret));

7
src/xrt/compositor/client/comp_vk_client.h
View file

@ -43,6 +43,13 @@ struct client_vk_swapchain
//! Non-owning reference to our parent compositor. //! Non-owning reference to our parent compositor.
struct client_vk_compositor *c; struct client_vk_compositor *c;
// Memory
VkDeviceMemory mems[XRT_MAX_SWAPCHAIN_IMAGES];
// Prerecorded swapchain image ownership/layout transition barriers
VkCommandBuffer acquire[XRT_MAX_SWAPCHAIN_IMAGES];
VkCommandBuffer release[XRT_MAX_SWAPCHAIN_IMAGES];
}; };
/*! /*!

6
src/xrt/include/xrt/xrt_compositor.h
View file

@ -812,12 +812,8 @@ struct xrt_swapchain_vk
//! @public Base //! @public Base
struct xrt_swapchain base; struct xrt_swapchain base;
//! Images to be used by the caller.
VkImage images[XRT_MAX_SWAPCHAIN_IMAGES]; VkImage images[XRT_MAX_SWAPCHAIN_IMAGES];
VkDeviceMemory mems[XRT_MAX_SWAPCHAIN_IMAGES];
// Prerecorded swapchain image ownership/layout transition barriers
VkCommandBuffer acquire[XRT_MAX_SWAPCHAIN_IMAGES];
VkCommandBuffer release[XRT_MAX_SWAPCHAIN_IMAGES];
}; };
/*! /*!