bbd5883c87
First, make all key_size functions take nr_samplers and nr_sampler_views separately so we ensure both get passed in. Second, rework the offset helpers to take MAX(nr_samplers, nr_sampler_views) so we get the image param offset correct if nr_samplers < nr_sampler_views. While we're here, also re-order the size calculations to be in the same order as the things land in memory. Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16435>