fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 14:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

panfrost: Assert ASTC/AFBC are not used on v4

Browse source 
These are not introduced until v5. The required enums do not exist on
v4. Assert this is so.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12814>
This commit is contained in:
Alyssa Rosenzweig 2021-09-30 09:34:52 -04:00 • committed by Marge Bot
parent f4f0e30701
commit 3d28039b3e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/panfrost/lib/pan_texture.c
View file

@ -348,13 +348,10 @@ pan_iview_get_surface(const struct pan_image_view *iview,
#else /* ifndef PAN_ARCH */ #else /* ifndef PAN_ARCH */
/* A Scalable Texture Compression (ASTC) corresponds to just a few texture type #if PAN_ARCH >= 5
* in the hardware, but in fact can be parametrized to have various widths and /* Arm Scalable Texture Compression (ASTC) corresponds to just a few formats.
* heights for the so-called "stretch factor". It turns out these parameters * The block dimension is not part of the format. Instead, it is encoded as a
* are stuffed in the bottom bits of the payload pointers. This functions * 6-bit tag on the payload pointer. Map the block size for a single dimension.
* computes these magic stuffing constants based on the ASTC format in use. The
* constant in a given dimension is 3-bits, and two are stored side-by-side for
* each active dimension.
*/ */
static unsigned static unsigned
@ -406,6 +403,7 @@ panfrost_compression_tag(const struct util_format_description *desc,
return 0; return 0;
} }
} }
#endif
/* Cubemaps have 6 faces as "layers" in between each actual layer. We /* Cubemaps have 6 faces as "layers" in between each actual layer. We
* need to fix this up. TODO: logic wrong in the asserted out cases ... * need to fix this up. TODO: logic wrong in the asserted out cases ...
@ -574,7 +572,7 @@ panfrost_emit_texture_payload(const struct pan_image_view *iview,
void *payload) void *payload)
{ {
const struct pan_image_layout *layout = &iview->image->layout; const struct pan_image_layout *layout = &iview->image->layout;
const struct util_format_description *desc = ASSERTED const struct util_format_description *desc =
util_format_description(format); util_format_description(format);
mali_ptr base = iview->image->data.bo->ptr.gpu + iview->image->data.offset; mali_ptr base = iview->image->data.bo->ptr.gpu + iview->image->data.offset;
@ -584,10 +582,15 @@ panfrost_emit_texture_payload(const struct pan_image_view *iview,
base += iview->buf.offset; base += iview->buf.offset;
} }
#if PAN_ARCH >= 5
/* panfrost_compression_tag() wants the dimension of the resource, not the /* panfrost_compression_tag() wants the dimension of the resource, not the
* one of the image view (those might differ). * one of the image view (those might differ).
*/ */
base |= panfrost_compression_tag(desc, layout->dim, layout->modifier); base |= panfrost_compression_tag(desc, layout->dim, layout->modifier);
#else
assert(!drm_is_afbc(layout->modifier) && "no AFBC on v4");
assert(desc->layout != UTIL_FORMAT_LAYOUT_ASTC && "no ASTC on v4");
#endif
/* Inject the addresses in, interleaving array indices, mip levels, /* Inject the addresses in, interleaving array indices, mip levels,
* cube faces, and strides in that order */ * cube faces, and strides in that order */