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

panfrost: Fix format tables for v4 and v5

Browse source 
pan_format.c was only being built with PAN_ARCH in [6, 7, 9], but has
conditional compilation for PAN_ARCH <= 5 which never got compiled.

Signed-off-by: Ray Smith <rsmith@brightsign.biz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26980>
This commit is contained in:
Ray Smith 2024-01-10 17:00:37 +00:00 • committed by Marge Bot
parent 404da63a0e
commit c5ba55314c
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/panfrost/lib/meson.build
View file

@ -22,7 +22,7 @@
subdir('genxml')
subdir('kmod')
pixel_format_versions = ['6', '7', '9']
pixel_format_versions = ['5', '6', '7', '9']
libpanfrost_pixel_format = []
foreach ver : pixel_format_versions

3
src/panfrost/lib/pan_format.h
View file

@ -55,12 +55,15 @@ struct pan_blendable_format {
mali_pixel_format bifrost[2];
};
extern const struct pan_blendable_format
panfrost_blendable_formats_v5[PIPE_FORMAT_COUNT];
extern const struct pan_blendable_format
panfrost_blendable_formats_v6[PIPE_FORMAT_COUNT];
extern const struct pan_blendable_format
panfrost_blendable_formats_v7[PIPE_FORMAT_COUNT];
extern const struct pan_blendable_format
panfrost_blendable_formats_v9[PIPE_FORMAT_COUNT];
extern const struct panfrost_format panfrost_pipe_format_v5[PIPE_FORMAT_COUNT];
extern const struct panfrost_format panfrost_pipe_format_v6[PIPE_FORMAT_COUNT];
extern const struct panfrost_format panfrost_pipe_format_v7[PIPE_FORMAT_COUNT];
extern const struct panfrost_format panfrost_pipe_format_v9[PIPE_FORMAT_COUNT];

5
src/panfrost/lib/pan_props.c
View file

@ -250,7 +250,10 @@ panfrost_open_device(void *memctx, int fd, struct panfrost_device *dev)
dev->tiler_features = panfrost_query_tiler_features(dev);
dev->has_afbc = panfrost_query_afbc(dev, dev->arch);
if (dev->arch <= 6) {
if (dev->arch <= 5) {
dev->formats = panfrost_pipe_format_v5;
dev->blendable_formats = panfrost_blendable_formats_v5;
} else if (dev->arch == 6) {
dev->formats = panfrost_pipe_format_v6;
dev->blendable_formats = panfrost_blendable_formats_v6;
} else if (dev->arch <= 7) {