st/pbo_compute: use different calc for non-3d compute buffer sizing

this avoids looking at irrelevant 3d pixelstore params like
GL_PACK_IMAGE_HEIGHT when they don't apply, which will cause the storage
buffer to be incorrectly sized and break the operation

Fixes: e7b9561959 ("gallium: implement compute pbo download")

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16728>
This commit is contained in:
Mike Blumenkrantz 2022-05-26 14:48:47 -04:00 committed by Marge Bot
parent 5b02facc8c
commit 70fb3a4700

View file

@ -929,7 +929,12 @@ download_texture_compute(struct st_context *st,
}
/* Set up destination buffer */
unsigned img_stride = _mesa_image_image_stride(pack, width, height, format, type);
unsigned img_stride = src->target == PIPE_TEXTURE_3D ||
src->target == PIPE_TEXTURE_2D_ARRAY ||
src->target == PIPE_TEXTURE_CUBE_ARRAY ?
/* only use image stride for 3d images to avoid pulling in IMAGE_HEIGHT pixelstore */
_mesa_image_image_stride(pack, width, height, format, type) :
_mesa_image_row_stride(pack, width, format, type) * height;
unsigned buffer_size = (depth + (dim == 3 ? pack->SkipImages : 0)) * img_stride;
{
struct pipe_shader_buffer buffer;