matrixfurry.com / monado
The open source OpenXR runtime
fork atom

ipc: delete 32/64bit compatibility static_assert

Checks are now performed by CI, we can drop hardcoded structure sizes in
code.
Closes #532

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2593>

Patrick Nicolas a00c833e fb199971

-49
unified split
-13
src/xrt/include/xrt/xrt_defines.h
··· 2040 2040 int64_t duration_ns; 2041 2041 }; 2042 2042 2043 - static_assert(sizeof(struct xrt_output_value_vibration) == 16, 2044 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 2045 - 2046 2043 struct xrt_output_value_pcm_vibration 2047 2044 { 2048 2045 uint32_t buffer_size; ··· 2052 2049 uint32_t *samples_consumed; 2053 2050 }; 2054 2051 2055 - static_assert(sizeof(struct xrt_output_value_pcm_vibration) == 32, 2056 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 2057 - 2058 2052 struct xrt_output_value_force_feedback 2059 2053 { 2060 2054 struct xrt_output_force_feedback force_feedback[5]; 2061 2055 uint64_t force_feedback_location_count; 2062 2056 }; 2063 2057 2064 - static_assert(sizeof(struct xrt_output_value_force_feedback) == 48, 2065 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 2066 - 2067 2058 /*! 2068 2059 * A union of all output types. 2069 2060 * ··· 2080 2071 struct xrt_output_value_force_feedback force_feedback; 2081 2072 }; 2082 2073 }; 2083 - 2084 - static_assert(sizeof(struct xrt_output_value) == 56, 2085 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 2086 - 2087 2074 2088 2075 /* 2089 2076 *
-36
src/xrt/ipc/shared/ipc_protocol.h
··· 74 74 struct xrt_pose offset; 75 75 }; 76 76 77 - static_assert(sizeof(struct ipc_shared_tracking_origin) == 288, 78 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 79 - 80 77 /*! 81 78 * A binding in the shared memory area. 82 79 * ··· 96 93 //! Offset into the array of pairs where this output bindings starts. 97 94 uint32_t first_output_index; 98 95 }; 99 - 100 - static_assert(sizeof(struct ipc_shared_binding_profile) == 20, 101 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 102 96 103 97 /*! 104 98 * A device in the shared memory area. ··· 139 133 struct xrt_device_supported supported; 140 134 }; 141 135 142 - static_assert(sizeof(struct ipc_shared_device) == 568, 143 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 144 - 145 136 /*! 146 137 * Data for a single composition layer. 147 138 * ··· 168 159 struct xrt_layer_data data; 169 160 }; 170 161 171 - static_assert(sizeof(struct ipc_layer_entry) == 392, 172 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 173 - 174 162 /*! 175 163 * Render state for a single client, including all layers. 176 164 * ··· 182 170 uint32_t layer_count; 183 171 struct ipc_layer_entry layers[IPC_MAX_LAYERS]; 184 172 }; 185 - 186 - static_assert(sizeof(struct ipc_layer_slot) == IPC_MAX_LAYERS * sizeof(struct ipc_layer_entry) + 32, 187 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 188 173 189 174 /*! 190 175 * A big struct that contains all data that is shared to a client, no pointers ··· 299 284 uint64_t startup_timestamp; 300 285 struct xrt_plane_detector_begin_info_ext plane_begin_info_ext; 301 286 }; 302 - 303 - static_assert(sizeof(struct ipc_shared_memory) == 6500056, 304 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 305 287 306 288 /*! 307 289 * Initial info from a client when it connects. ··· 312 294 struct xrt_application_info info; 313 295 }; 314 296 315 - static_assert(sizeof(struct ipc_client_description) == 144, 316 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 317 - 318 297 struct ipc_client_list 319 298 { 320 299 uint32_t ids[IPC_MAX_CLIENTS]; 321 300 uint32_t id_count; 322 301 }; 323 - 324 - static_assert(sizeof(struct ipc_client_list) == 36, 325 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 326 302 327 303 /*! 328 304 * State for a connected application. ··· 344 320 pid_t pid; 345 321 struct xrt_application_info info; 346 322 }; 347 - 348 - static_assert(sizeof(struct ipc_app_state) == 160, 349 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 350 323 351 324 352 325 /*! ··· 357 330 uint32_t sizes[XRT_MAX_SWAPCHAIN_IMAGES]; 358 331 }; 359 332 360 - static_assert(sizeof(struct ipc_arg_swapchain_from_native) == 32, 361 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 362 - 363 333 /*! 364 334 * Arguments for xrt_device::get_view_poses with two views. 365 335 */ ··· 370 340 struct xrt_space_relation head_relation; 371 341 }; 372 342 373 - static_assert(sizeof(struct ipc_info_get_view_poses_2) == 144, 374 - "invalid structure size, maybe different 32/64 bits sizes or padding"); 375 - 376 343 struct ipc_pcm_haptic_buffer 377 344 { 378 345 uint32_t num_samples; 379 346 float sample_rate; 380 347 bool append; 381 348 }; 382 - 383 - static_assert(sizeof(struct ipc_pcm_haptic_buffer) == 12, 384 - "invalid structure size, maybe different 32/64 bits sizes or padding");