c/main: Renames and comment cleanup to improve readability.

+70 -70

1 changed file

expand all

src

xrt

compositor

main

comp_renderer.c

+70 -70

src/xrt/compositor/main/comp_renderer.c

··· 312 312 struct xrt_pose xdev_poses[XRT_MAX_VIEWS] = XRT_STRUCT_INIT; 313 313 314 314 xrt_device_get_view_poses( // 315 - r->c->xdev, // xdev 316 - &default_eye_relation, // default_eye_relation 315 + r->c->xdev, // 316 + &default_eye_relation, // 317 317 r->c->frame.rendering.predicted_display_time_ns, // at_timestamp_ns 318 - view_count, // view_count 318 + view_count, // 319 319 &head_relation, // out_head_relation 320 320 xdev_fovs, // out_fovs 321 321 xdev_poses); // out_poses ··· 397 397 398 398 render_gfx_render_pass_init( // 399 399 &r->target_render_pass, // rgrp 400 - &r->c->nr, // r 401 - r->c->target->format, // format 400 + &r->c->nr, // struct render_resources 401 + r->c->target->format, // 402 402 VK_ATTACHMENT_LOAD_OP_CLEAR, // load_op 403 403 VK_IMAGE_LAYOUT_PRESENT_SRC_KHR); // final_layout 404 404 ··· 568 568 // Shared render pass between all scratch images. 569 569 render_gfx_render_pass_init( // 570 570 &r->scratch_render_pass, // rgrp 571 - &r->c->nr, // r 571 + &r->c->nr, // struct render_resources 572 572 VK_FORMAT_R8G8B8A8_SRGB, // format 573 573 VK_ATTACHMENT_LOAD_OP_CLEAR, // load_op 574 574 VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); // final_layout ··· 841 841 */ 842 842 843 843 /*! 844 - * @pre render_gfx_init(rr, &c->nr) 844 + * @pre render_gfx_init(render, &c->nr) 845 845 */ 846 846 static XRT_CHECK_RESULT VkResult 847 847 dispatch_graphics(struct comp_renderer *r, 848 - struct render_gfx *rr, 848 + struct render_gfx *render, 849 849 struct comp_render_scratch_state *crss, 850 850 enum comp_target_fov_source fov_source) 851 851 { ··· 869 869 870 870 // Viewport information. 871 871 struct render_viewport_data viewport_datas[XRT_MAX_VIEWS]; 872 - calc_viewport_data(r, viewport_datas, rr->r->view_count); 872 + calc_viewport_data(r, viewport_datas, render->r->view_count); 873 873 874 874 // Vertex rotation information. 875 875 struct xrt_matrix_2x2 vertex_rots[XRT_MAX_VIEWS]; 876 - calc_vertex_rot_data(r, vertex_rots, rr->r->view_count); 876 + calc_vertex_rot_data(r, vertex_rots, render->r->view_count); 877 877 878 878 // Device view information. 879 879 struct xrt_fov fovs[XRT_MAX_VIEWS]; 880 880 struct xrt_pose world_poses[XRT_MAX_VIEWS]; 881 881 struct xrt_pose eye_poses[XRT_MAX_VIEWS]; 882 - calc_pose_data( // 883 - r, // r 884 - fov_source, // fov_source 885 - fovs, // fovs 886 - world_poses, // world_poses 887 - eye_poses, // eye_poses 888 - rr->r->view_count); // view_count 882 + calc_pose_data( // 883 + r, // 884 + fov_source, // 885 + fovs, // 886 + world_poses, // 887 + eye_poses, // 888 + render->r->view_count); // 889 889 890 890 891 891 // The arguments for the dispatch function. ··· 895 895 rtr, // rtr 896 896 fast_path, // fast_path 897 897 do_timewarp); // do_timewarp 898 - for (uint32_t i = 0; i < rr->r->view_count; i++) { 898 + for (uint32_t i = 0; i < render->r->view_count; i++) { 899 899 // Which image of the scratch images for this view are we using. 900 900 uint32_t scratch_index = crss->views[i].index; 901 901 ··· 920 920 struct xrt_normalized_rect layer_norm_rect = {.x = 0.0f, .y = 0.0f, .w = 1.0f, .h = 1.0f}; 921 921 922 922 comp_render_gfx_add_view( // 923 - &data, // data 924 - &world_poses[i], // world_pose 925 - &eye_poses[i], // eye_pose 926 - &fovs[i], // fov 927 - rsci_rtr, // rtr 928 - &layer_viewport_data, // layer_viewport_data 929 - &layer_norm_rect, // layer_norm_rect 930 - rsci->image, // image 931 - rsci->srgb_view, // srgb_view 932 - &vertex_rots[i], // vertex_rot 923 + &data, // 924 + &world_poses[i], // 925 + &eye_poses[i], // 926 + &fovs[i], // 927 + rsci_rtr, // 928 + &layer_viewport_data, // 929 + &layer_norm_rect, // 930 + rsci->image, // 931 + rsci->srgb_view, // 932 + &vertex_rots[i], // 933 933 &viewport_datas[i]); // target_viewport_data 934 934 935 935 if (layer_count == 0) { ··· 940 940 } 941 941 942 942 // Start the graphics pipeline. 943 - render_gfx_begin(rr); 943 + render_gfx_begin(render); 944 944 945 945 // Build the command buffer. 946 946 comp_render_gfx_dispatch( // 947 - rr, // rr 948 - layers, // layers 949 - layer_count, // layer_count 950 - &data); // d 947 + render, // 948 + layers, // 949 + layer_count, // 950 + &data); // 951 951 952 952 // Make the command buffer submittable. 953 - render_gfx_end(rr); 953 + render_gfx_end(render); 954 954 955 955 // Everything is ready, submit to the queue. 956 - ret = renderer_submit_queue(r, rr->r->cmd, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); 956 + ret = renderer_submit_queue(r, render->r->cmd, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); 957 957 VK_CHK_AND_RET(ret, "renderer_submit_queue"); 958 958 959 959 return ret; ··· 967 967 */ 968 968 969 969 /*! 970 - * @pre render_compute_init(crc, &c->nr) 970 + * @pre render_compute_init(render, &c->nr) 971 971 */ 972 972 static XRT_CHECK_RESULT VkResult 973 973 dispatch_compute(struct comp_renderer *r, 974 - struct render_compute *crc, 974 + struct render_compute *render, 975 975 struct comp_render_scratch_state *crss, 976 976 enum comp_target_fov_source fov_source) 977 977 { ··· 991 991 struct xrt_fov fovs[XRT_MAX_VIEWS]; 992 992 struct xrt_pose world_poses[XRT_MAX_VIEWS]; 993 993 struct xrt_pose eye_poses[XRT_MAX_VIEWS]; 994 - calc_pose_data( // 995 - r, // r 996 - fov_source, // fov_source 997 - fovs, // fovs 998 - world_poses, // world_poses 999 - eye_poses, // eye_poses 1000 - crc->r->view_count); // view_count 994 + calc_pose_data( // 995 + r, // 996 + fov_source, // 997 + fovs, // 998 + world_poses, // 999 + eye_poses, // 1000 + render->r->view_count); // 1001 1001 1002 1002 // Target Vulkan resources.. 1003 1003 VkImage target_image = r->c->target->images[r->acquired_buffer].handle; ··· 1005 1005 1006 1006 // Target view information. 1007 1007 struct render_viewport_data views[XRT_MAX_VIEWS]; 1008 - calc_viewport_data(r, views, crc->r->view_count); 1008 + calc_viewport_data(r, views, render->r->view_count); 1009 1009 1010 1010 // The arguments for the dispatch function. 1011 1011 struct comp_render_dispatch_data data; ··· 1016 1016 fast_path, // fast_path 1017 1017 do_timewarp); // do_timewarp 1018 1018 1019 - for (uint32_t i = 0; i < crc->r->view_count; i++) { 1019 + for (uint32_t i = 0; i < render->r->view_count; i++) { 1020 1020 // Which image of the scratch images for this view are we using. 1021 1021 uint32_t scratch_index = crss->views[i].index; 1022 1022 ··· 1038 1038 struct xrt_normalized_rect layer_norm_rect = {.x = 0.0f, .y = 0.0f, .w = 1.0f, .h = 1.0f}; 1039 1039 1040 1040 comp_render_cs_add_view( // 1041 - &data, // data 1042 - &world_poses[i], // world_pose 1043 - &eye_poses[i], // eye_pose 1044 - &fovs[i], // fov 1045 - &layer_viewport_data, // layer_viewport_data 1046 - &layer_norm_rect, // layer_norm_rect 1047 - rsci->image, // image 1048 - rsci->srgb_view, // srgb_view 1049 - rsci->unorm_view, // unorm_view 1041 + &data, // 1042 + &world_poses[i], // 1043 + &eye_poses[i], // 1044 + &fovs[i], // 1045 + &layer_viewport_data, // 1046 + &layer_norm_rect, // 1047 + rsci->image, // 1048 + rsci->srgb_view, // 1049 + rsci->unorm_view, // 1050 1050 &views[i]); // target_viewport_data 1051 1051 1052 1052 if (layer_count == 0) { ··· 1057 1057 } 1058 1058 1059 1059 // Start the compute pipeline. 1060 - render_compute_begin(crc); 1060 + render_compute_begin(render); 1061 1061 1062 1062 // Build the command buffer. 1063 1063 comp_render_cs_dispatch( // 1064 - crc, // crc 1065 - layers, // layers 1066 - layer_count, // layer_count 1067 - &data); // d 1064 + render, // 1065 + layers, // 1066 + layer_count, // 1067 + &data); // 1068 1068 1069 1069 // Make the command buffer submittable. 1070 - render_compute_end(crc); 1070 + render_compute_end(render); 1071 1071 1072 1072 // Everything is ready, submit to the queue. 1073 - ret = renderer_submit_queue(r, crc->r->cmd, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); 1073 + ret = renderer_submit_queue(r, render->r->cmd, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); 1074 1074 VK_CHK_AND_RET(ret, "renderer_submit_queue"); 1075 1075 1076 1076 return ret; ··· 1133 1133 scratch_get_init(&crss, r, view_count); 1134 1134 1135 1135 bool use_compute = r->settings->use_compute; 1136 - struct render_gfx rr = {0}; 1137 - struct render_compute crc = {0}; 1136 + struct render_gfx render_g = {0}; 1137 + struct render_compute render_c = {0}; 1138 1138 1139 1139 VkResult res = VK_SUCCESS; 1140 1140 if (use_compute) { 1141 - render_compute_init(&crc, &c->nr); 1142 - res = dispatch_compute(r, &crc, &crss, fov_source); 1141 + render_compute_init(&render_c, &c->nr); 1142 + res = dispatch_compute(r, &render_c, &crss, fov_source); 1143 1143 } else { 1144 - render_gfx_init(&rr, &c->nr); 1145 - res = dispatch_graphics(r, &rr, &crss, fov_source); 1144 + render_gfx_init(&render_g, &c->nr); 1145 + res = dispatch_graphics(r, &render_g, &crss, fov_source); 1146 1146 } 1147 1147 if (res != VK_SUCCESS) { 1148 1148 return XRT_ERROR_VULKAN; ··· 1244 1244 */ 1245 1245 1246 1246 if (use_compute) { 1247 - render_compute_fini(&crc); 1247 + render_compute_fini(&render_c); 1248 1248 } else { 1249 - render_gfx_fini(&rr); 1249 + render_gfx_fini(&render_g); 1250 1250 } 1251 1251 1252 1252

Configure Feed

Configure Feed