matrixfurry.com
The open source OpenXR runtime
c/render: Rename vk_from_rr to vk_from_render
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2380>
+10
-10
src/xrt/compositor/render/render_gfx.c
+10
-10
src/xrt/compositor/render/render_gfx.c
···
34
34
* Get the @ref vk_bundle from @ref render_gfx.
35
35
*/
36
36
static inline struct vk_bundle *
37
-
vk_from_rr(struct render_gfx *render)
37
+
vk_from_render(struct render_gfx *render)
38
38
{
39
39
return render->r->vk;
40
40
}
···
248
248
{
249
249
VkDescriptorSet descriptor_set = VK_NULL_HANDLE;
250
250
struct render_sub_alloc ubo = XRT_STRUCT_INIT;
251
-
struct vk_bundle *vk = vk_from_rr(render);
251
+
struct vk_bundle *vk = vk_from_render(render);
252
252
253
253
VkResult ret;
254
254
···
295
295
static inline void
296
296
dispatch_no_vbo(struct render_gfx *render, uint32_t vertex_count, VkPipeline pipeline, VkDescriptorSet descriptor_set)
297
297
{
298
-
struct vk_bundle *vk = vk_from_rr(render);
298
+
struct vk_bundle *vk = vk_from_render(render);
299
299
struct render_resources *r = render->r;
300
300
301
301
···
971
971
bool
972
972
render_gfx_begin(struct render_gfx *render)
973
973
{
974
-
struct vk_bundle *vk = vk_from_rr(render);
974
+
struct vk_bundle *vk = vk_from_render(render);
975
975
VkResult ret;
976
976
977
977
ret = vk->vkResetCommandPool(vk->device, render->r->cmd_pool, 0);
···
1006
1006
bool
1007
1007
render_gfx_end(struct render_gfx *render)
1008
1008
{
1009
-
struct vk_bundle *vk = vk_from_rr(render);
1009
+
struct vk_bundle *vk = vk_from_render(render);
1010
1010
VkResult ret;
1011
1011
1012
1012
vk->vkCmdWriteTimestamp( //
···
1024
1024
void
1025
1025
render_gfx_fini(struct render_gfx *render)
1026
1026
{
1027
-
struct vk_bundle *vk = vk_from_rr(render);
1027
+
struct vk_bundle *vk = vk_from_render(render);
1028
1028
struct render_resources *r = render->r;
1029
1029
1030
1030
// Reclaim all descriptor sets.
···
1049
1049
struct render_gfx_target_resources *rtr,
1050
1050
const VkClearColorValue *color)
1051
1051
{
1052
-
struct vk_bundle *vk = vk_from_rr(render);
1052
+
struct vk_bundle *vk = vk_from_render(render);
1053
1053
1054
1054
assert(render->rtr == NULL);
1055
1055
render->rtr = rtr;
···
1073
1073
void
1074
1074
render_gfx_end_target(struct render_gfx *render)
1075
1075
{
1076
-
struct vk_bundle *vk = vk_from_rr(render);
1076
+
struct vk_bundle *vk = vk_from_render(render);
1077
1077
1078
1078
assert(render->rtr != NULL);
1079
1079
render->rtr = NULL;
···
1085
1085
void
1086
1086
render_gfx_begin_view(struct render_gfx *render, uint32_t view, const struct render_viewport_data *viewport_data)
1087
1087
{
1088
-
struct vk_bundle *vk = vk_from_rr(render);
1088
+
struct vk_bundle *vk = vk_from_render(render);
1089
1089
1090
1090
// We currently only support two views.
1091
1091
assert(view == 0 || view == 1);
···
1165
1165
void
1166
1166
render_gfx_mesh_draw(struct render_gfx *render, uint32_t mesh_index, VkDescriptorSet descriptor_set, bool do_timewarp)
1167
1167
{
1168
-
struct vk_bundle *vk = vk_from_rr(render);
1168
+
struct vk_bundle *vk = vk_from_render(render);
1169
1169
struct render_resources *r = render->r;
1170
1170
1171
1171