The open source OpenXR runtime

c/render: fix semantically incorrect cs max image size calculation

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

Changed files
+8 -3
src
xrt
+7 -2
src/xrt/compositor/render/render_interface.h
··· 59 59 #define RENDER_MAX_LAYERS (XRT_MAX_LAYERS) 60 60 61 61 /*! 62 + * The maximum number samplers per view that can be used by the compute shader 63 + * for layer composition (layer.comp) 64 + */ 65 + #define RENDER_CS_MAX_SAMPLERS_PER_VIEW 2 66 + 67 + /*! 62 68 * Max number of images that can be given at a single time to the layer 63 69 * squasher in a single dispatch. 64 70 */ 65 - #define RENDER_MAX_IMAGES_SIZE (RENDER_MAX_LAYERS * XRT_MAX_VIEWS) 66 - #define RENDER_MAX_IMAGES_COUNT(RENDER_RESOURCES) (RENDER_MAX_LAYERS * RENDER_RESOURCES->view_count) 71 + #define RENDER_MAX_IMAGES_SIZE (RENDER_MAX_LAYERS * RENDER_CS_MAX_SAMPLERS_PER_VIEW) 67 72 68 73 /*! 69 74 * Maximum number of times that the layer squasher shader can run per
+1 -1
src/xrt/compositor/render/render_resources.c
··· 543 543 r->compute.ubo_binding = 3; 544 544 545 545 r->compute.layer.image_array_size = 546 - MIN(vk->features.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_COUNT(r)); 546 + MIN(vk->features.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_SIZE); 547 547 548 548 549 549 /*