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

c/render: Use define helpers in gfx code

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-09-30 14:38:38 +01:00
parent b8a226bf7b
commit 6e7a0a621c
1 changed files with 78 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/xrt/compositor/render/render_gfx.c
View file

@ -8,6 +8,8 @@
* @ingroup comp_render * @ingroup comp_render
*/ */
#include "vk/vk_mini_helpers.h"
#include "render/render_interface.h" #include "render/render_interface.h"
#include <stdio.h> #include <stdio.h>
@ -19,26 +21,6 @@
* *
*/ */
#define C(c) \
do { \
VkResult ret = c; \
if (ret != VK_SUCCESS) { \
return false; \
} \
} while (false)
#define D(TYPE, thing) \
if (thing != VK_NULL_HANDLE) { \
vk->vkDestroy##TYPE(vk->device, thing, NULL); \
thing = VK_NULL_HANDLE; \
}
#define DD(pool, thing) \
if (thing != VK_NULL_HANDLE) { \
free_descriptor_set(vk, pool, thing); \
thing = VK_NULL_HANDLE; \
}
/*! /*!
* Get the @ref vk_bundle from @ref render_gfx_target_resources. * Get the @ref vk_bundle from @ref render_gfx_target_resources.
*/ */
@ -57,7 +39,7 @@ vk_from_rr(struct render_gfx *rr)
return rr->r->vk; return rr->r->vk;
} }
static VkResult XRT_CHECK_RESULT static VkResult
create_implicit_render_pass(struct vk_bundle *vk, create_implicit_render_pass(struct vk_bundle *vk,
VkFormat format, VkFormat format,
VkAttachmentLoadOp load_op, VkAttachmentLoadOp load_op,
@ -115,21 +97,19 @@ create_implicit_render_pass(struct vk_bundle *vk,
}; };
VkRenderPass render_pass = VK_NULL_HANDLE; VkRenderPass render_pass = VK_NULL_HANDLE;
ret = vk->vkCreateRenderPass(vk->device, // ret = vk->vkCreateRenderPass( //
vk->device, //
&render_pass_info, // &render_pass_info, //
NULL, // NULL, //
&render_pass); // &render_pass); //
if (ret != VK_SUCCESS) { VK_CHK_AND_RET(ret, "vkCreateRenderPass");
VK_ERROR(vk, "vkCreateRenderPass failed: %s", vk_result_string(ret));
return ret;
}
*out_render_pass = render_pass; *out_render_pass = render_pass;
return VK_SUCCESS; return VK_SUCCESS;
} }
static VkResult XRT_CHECK_RESULT static VkResult
create_framebuffer(struct vk_bundle *vk, create_framebuffer(struct vk_bundle *vk,
VkImageView image_view, VkImageView image_view,
VkRenderPass render_pass, VkRenderPass render_pass,
@ -152,14 +132,12 @@ create_framebuffer(struct vk_bundle *vk,
}; };
VkFramebuffer framebuffer = VK_NULL_HANDLE; VkFramebuffer framebuffer = VK_NULL_HANDLE;
ret = vk->vkCreateFramebuffer(vk->device, // ret = vk->vkCreateFramebuffer( //
vk->device, //
&frame_buffer_info, // &frame_buffer_info, //
NULL, // NULL, //
&framebuffer); // &framebuffer); //
if (ret != VK_SUCCESS) { VK_CHK_AND_RET(ret, "vkCreateFramebuffer");
VK_ERROR(vk, "vkCreateFramebuffer failed: %s", vk_result_string(ret));
return ret;
}
*out_external_framebuffer = framebuffer; *out_external_framebuffer = framebuffer;
@ -209,7 +187,7 @@ begin_render_pass(struct vk_bundle *vk,
* *
*/ */
static VkResult XRT_CHECK_RESULT static VkResult
create_mesh_pipeline(struct vk_bundle *vk, create_mesh_pipeline(struct vk_bundle *vk,
VkRenderPass render_pass, VkRenderPass render_pass,
VkPipelineLayout pipeline_layout, VkPipelineLayout pipeline_layout,
@ -357,16 +335,14 @@ create_mesh_pipeline(struct vk_bundle *vk,
}; };
VkPipeline pipeline = VK_NULL_HANDLE; VkPipeline pipeline = VK_NULL_HANDLE;
ret = vk->vkCreateGraphicsPipelines(vk->device, // ret = vk->vkCreateGraphicsPipelines( //
vk->device, //
pipeline_cache, // pipeline_cache, //
1, // 1, //
&pipeline_info, // &pipeline_info, //
NULL, // NULL, //
&pipeline); // &pipeline); //
if (ret != VK_SUCCESS) { VK_CHK_AND_RET(ret, "vkCreateGraphicsPipelines");
VK_DEBUG(vk, "vkCreateGraphicsPipelines failed: %s", vk_result_string(ret));
return ret;
}
*out_mesh_pipeline = pipeline; *out_mesh_pipeline = pipeline;
@ -414,7 +390,8 @@ update_mesh_discriptor_set(struct vk_bundle *vk,
}, },
}; };
vk->vkUpdateDescriptorSets(vk->device, // vk->vkUpdateDescriptorSets( //
vk->device, //
ARRAY_SIZE(write_descriptor_sets), // descriptorWriteCount ARRAY_SIZE(write_descriptor_sets), // descriptorWriteCount
write_descriptor_sets, // pDescriptorWrites write_descriptor_sets, // pDescriptorWrites
0, // descriptorCopyCount 0, // descriptorCopyCount
@ -435,15 +412,19 @@ render_gfx_render_pass_init(struct render_gfx_render_pass *rgrp,
VkAttachmentLoadOp load_op, VkAttachmentLoadOp load_op,
VkImageLayout final_layout) VkImageLayout final_layout)
{ {
C(create_implicit_render_pass( // struct vk_bundle *vk = r->vk;
r->vk, // vk_bundle VkResult ret;
ret = create_implicit_render_pass( //
vk, // vk_bundle
format, // target_format format, // target_format
load_op, // load_op load_op, // load_op
final_layout, // final_layout final_layout, // final_layout
&rgrp->render_pass)); // out_render_pass &rgrp->render_pass); // out_render_pass
VK_CHK_WITH_RET(ret, "create_implicit_render_pass", false);
C(create_mesh_pipeline( // ret = create_mesh_pipeline( //
r->vk, // vk_bundle vk, // vk_bundle
rgrp->render_pass, // render_pass rgrp->render_pass, // render_pass
r->mesh.pipeline_layout, // pipeline_layout r->mesh.pipeline_layout, // pipeline_layout
r->pipeline_cache, // pipeline_cache r->pipeline_cache, // pipeline_cache
@ -452,7 +433,8 @@ render_gfx_render_pass_init(struct render_gfx_render_pass *rgrp,
r->mesh.stride, // mesh_stride r->mesh.stride, // mesh_stride
r->shaders->mesh_vert, // mesh_vert r->shaders->mesh_vert, // mesh_vert
r->shaders->mesh_frag, // mesh_frag r->shaders->mesh_frag, // mesh_frag
&rgrp->mesh.pipeline)); // out_mesh_pipeline &rgrp->mesh.pipeline); // out_mesh_pipeline
VK_CHK_WITH_RET(ret, "create_mesh_pipeline", false);
// Set fields. // Set fields.
rgrp->r = r; rgrp->r = r;
@ -490,15 +472,17 @@ render_gfx_target_resources_init(struct render_gfx_target_resources *rtr,
VkExtent2D extent) VkExtent2D extent)
{ {
struct vk_bundle *vk = r->vk; struct vk_bundle *vk = r->vk;
VkResult ret;
rtr->r = r; rtr->r = r;
C(create_framebuffer( // ret = create_framebuffer( //
vk, // vk_bundle, vk, // vk_bundle,
target, // image_view, target, // image_view,
rgrp->render_pass, // render_pass, rgrp->render_pass, // render_pass,
extent.width, // width, extent.width, // width,
extent.height, // height, extent.height, // height,
&rtr->framebuffer)); // out_external_framebuffer &rtr->framebuffer); // out_external_framebuffer
VK_CHK_WITH_RET(ret, "create_framebuffer", false);
// Set fields. // Set fields.
rtr->rgrp = rgrp; rtr->rgrp = rgrp;
@ -528,6 +512,7 @@ bool
render_gfx_init(struct render_gfx *rr, struct render_resources *r) render_gfx_init(struct render_gfx *rr, struct render_resources *r)
{ {
struct vk_bundle *vk = r->vk; struct vk_bundle *vk = r->vk;
VkResult ret;
rr->r = r; rr->r = r;
@ -535,17 +520,19 @@ render_gfx_init(struct render_gfx *rr, struct render_resources *r)
* Mesh per view * Mesh per view
*/ */
C(vk_create_descriptor_set( // ret = vk_create_descriptor_set( //
vk, // vk_bundle vk, // vk_bundle
r->mesh.descriptor_pool, // descriptor_pool r->mesh.descriptor_pool, // descriptor_pool
r->mesh.descriptor_set_layout, // descriptor_set_layout r->mesh.descriptor_set_layout, // descriptor_set_layout
&rr->views[0].mesh.descriptor_set)); // descriptor_set &rr->views[0].mesh.descriptor_set); // descriptor_set
VK_CHK_WITH_RET(ret, "vk_create_descriptor_set", false);
C(vk_create_descriptor_set( // ret = vk_create_descriptor_set( //
vk, // vk_bundle vk, // vk_bundle
r->mesh.descriptor_pool, // descriptor_pool r->mesh.descriptor_pool, // descriptor_pool
r->mesh.descriptor_set_layout, // descriptor_set_layout r->mesh.descriptor_set_layout, // descriptor_set_layout
&rr->views[1].mesh.descriptor_set)); // descriptor_set &rr->views[1].mesh.descriptor_set); // descriptor_set
VK_CHK_WITH_RET(ret, "vk_create_descriptor_set", false);
return true; return true;
} }
@ -554,17 +541,21 @@ bool
render_gfx_begin(struct render_gfx *rr) render_gfx_begin(struct render_gfx *rr)
{ {
struct vk_bundle *vk = vk_from_rr(rr); struct vk_bundle *vk = vk_from_rr(rr);
VkResult ret;
ret = vk->vkResetCommandPool(vk->device, rr->r->cmd_pool, 0);
VK_CHK_WITH_RET(ret, "vkResetCommandPool", false);
C(vk->vkResetCommandPool(vk->device, rr->r->cmd_pool, 0));
VkCommandBufferBeginInfo begin_info = { VkCommandBufferBeginInfo begin_info = {
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
}; };
C(vk->vkBeginCommandBuffer( // ret = vk->vkBeginCommandBuffer( //
rr->r->cmd, // commandBuffer rr->r->cmd, // commandBuffer
&begin_info)); // pBeginInfo &begin_info); // pBeginInfo
VK_CHK_WITH_RET(ret, "vkResetCommandPool", false);
vk->vkCmdResetQueryPool( // vk->vkCmdResetQueryPool( //
rr->r->cmd, // commandBuffer rr->r->cmd, // commandBuffer
@ -585,6 +576,7 @@ bool
render_gfx_end(struct render_gfx *rr) render_gfx_end(struct render_gfx *rr)
{ {
struct vk_bundle *vk = vk_from_rr(rr); struct vk_bundle *vk = vk_from_rr(rr);
VkResult ret;
vk->vkCmdWriteTimestamp( // vk->vkCmdWriteTimestamp( //
rr->r->cmd, // commandBuffer rr->r->cmd, // commandBuffer
@ -592,7 +584,8 @@ render_gfx_end(struct render_gfx *rr)
rr->r->query_pool, // queryPool rr->r->query_pool, // queryPool
1); // query 1); // query
C(vk->vkEndCommandBuffer(rr->r->cmd)); ret = vk->vkEndCommandBuffer(rr->r->cmd);
VK_CHK_WITH_RET(ret, "vkEndCommandBuffer", false);
return true; return true;
} }