fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pan/decode: Fix MSAA texture decoding

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5782>
This commit is contained in:
Alyssa Rosenzweig 2020-06-30 16:21:30 -04:00 • committed by Marge Bot
parent 797fa87ec9
commit eba9bcd3c9
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/panfrost/pandecode/decode.c
View file

@ -2065,8 +2065,9 @@ pandecode_texture_payload(mali_ptr payload,
/* Miptree for each face */
if (type == MALI_TEX_CUBE)
bitmap_count *= 6;
else if (type == MALI_TEX_3D && layout == MALI_TEXTURE_LINEAR)
bitmap_count *= (depth + 1);
/* Array of layers */
bitmap_count *= (depth + 1);
/* Array of textures */
bitmap_count *= (array_size + 1);
@ -2171,22 +2172,19 @@ pandecode_texture(mali_ptr u,
/* All four width/height/depth/array_size dimensions are present
* regardless of the type of texture, but it is an error to have
* non-zero dimensions for unused dimensions. Verify this. array_size
* can always be set, as can width. */
* can always be set, as can width. Depth used for MSAA. */
if (t->height && dimension < 2)
pandecode_msg("XXX: nonzero height for <2D texture\n");
if (t->depth && dimension < 3)
pandecode_msg("XXX: nonzero depth for <2D texture\n");
/* Print only the dimensions that are actually there */
pandecode_log_cont(": %d", t->width + 1);
if (dimension >= 2)
if (t->height || t->depth)
pandecode_log_cont("x%u", t->height + 1);
if (dimension >= 3)
if (t->depth)
pandecode_log_cont("x%u", t->depth + 1);
if (t->array_size)