fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 16:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: fix for GCC

Browse source 
Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36412>
This commit is contained in:
Icenowy Zheng 2025-05-09 17:52:48 +08:00 • committed by Marge Bot
parent f18f056d3c
commit d450367ea8
4 changed files with 31 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/imagination/common/device_info/axe-1-16m.h
View file

@ -28,11 +28,9 @@
#include "pvr_device_info.h"
static const struct pvr_device_ident pvr_device_ident_33_V_11_3 = {
.device_id = 0x33011003,
.series_name = "A-Series",
.public_name = "AXE-1-16M",
};
#define PVR_DEVICE_IDENT_33_V_11_3 \
.device_id = 0x33011003, .series_name = "A-Series", \
.public_name = "AXE-1-16M"
static const struct pvr_device_features pvr_device_features_33_V_11_3 = {
.has_common_store_size_in_dwords = true,
@ -111,11 +109,13 @@ static const struct pvr_device_quirks pvr_device_quirks_33_15_11_3 = {
};
static const struct pvr_device_info pvr_device_info_33_15_11_3 = {
.ident = pvr_device_ident_33_V_11_3,
.ident.b = 33,
.ident.v = 15,
.ident.n = 11,
.ident.c = 3,
.ident = {
PVR_DEVICE_IDENT_33_V_11_3,
.b = 33,
.v = 15,
.n = 11,
.c = 3,
},
.features = pvr_device_features_33_V_11_3,
.enhancements = pvr_device_enhancements_33_15_11_3,
.quirks = pvr_device_quirks_33_15_11_3,

19
src/imagination/common/device_info/bxs-4-64.h
View file

@ -28,11 +28,8 @@
#include "pvr_device_info.h"
static const struct pvr_device_ident pvr_device_ident_36_V_104_796 = {
.device_id = 0x36104796,
.series_name = "B-Series",
.public_name = "BXS-4-64",
};
#define PVR_DEVICE_IDENT_36_V_104_796 \
.device_id = 0x36104796, .series_name = "B-Series", .public_name = "BXS-4-64"
static const struct pvr_device_features pvr_device_features_36_V_104_796 = {
.has_astc = true,
@ -126,11 +123,13 @@ static const struct pvr_device_quirks pvr_device_quirks_36_53_104_796 = {
};
static const struct pvr_device_info pvr_device_info_36_53_104_796 = {
.ident = pvr_device_ident_36_V_104_796,
.ident.b = 36,
.ident.v = 53,
.ident.n = 104,
.ident.c = 796,
.ident = {
PVR_DEVICE_IDENT_36_V_104_796,
.b = 36,
.v = 53,
.n = 104,
.c = 796,
},
.features = pvr_device_features_36_V_104_796,
.enhancements = pvr_device_enhancements_36_53_104_796,
.quirks = pvr_device_quirks_36_53_104_796,

19
src/imagination/common/device_info/gx6250.h
View file

@ -28,11 +28,8 @@
#include "pvr_device_info.h"
static const struct pvr_device_ident pvr_device_ident_4_V_2_51 = {
.device_id = 0x6250,
.series_name = "Rogue",
.public_name = "GX6250",
};
#define PVR_DEVICE_IDENT_4_V_2_51 \
.device_id = 0x6250, .series_name = "Rogue", .public_name = "GX6250"
static const struct pvr_device_features pvr_device_features_4_V_2_51 = {
.has_astc = true,
@ -128,11 +125,13 @@ static const struct pvr_device_quirks pvr_device_quirks_4_40_2_51 = {
};
static const struct pvr_device_info pvr_device_info_4_40_2_51 = {
.ident = pvr_device_ident_4_V_2_51,
.ident.b = 4,
.ident.v = 40,
.ident.n = 2,
.ident.c = 51,
.ident = {
PVR_DEVICE_IDENT_4_V_2_51,
.b = 4,
.v = 40,
.n = 2,
.c = 51,
},
.features = pvr_device_features_4_V_2_51,
.enhancements = pvr_device_enhancements_4_40_2_51,
.quirks = pvr_device_quirks_4_40_2_51,

13
src/imagination/common/pvr_device_info.c
View file

@ -54,16 +54,9 @@ static const struct pvr_device_info *device_infos[] = {
*/
int pvr_device_info_init(struct pvr_device_info *info, uint64_t bvnc)
{
#define CASE_PACKED_BVNC_DEVICE_INFO(_b, _v, _n, _c) \
case PVR_BVNC_PACK(_b, _v, _n, _c): \
info->ident = pvr_device_ident_##_b##_V_##_n##_##_c; \
info->ident.b = _b; \
info->ident.v = _v; \
info->ident.n = _n; \
info->ident.c = _c; \
info->features = pvr_device_features_##_b##_V_##_n##_##_c; \
info->enhancements = pvr_device_enhancements_##_b##_##_v##_##_n##_##_c; \
info->quirks = pvr_device_quirks_##_b##_##_v##_##_n##_##_c; \
#define CASE_PACKED_BVNC_DEVICE_INFO(_b, _v, _n, _c) \
case PVR_BVNC_PACK(_b, _v, _n, _c): \
*info = pvr_device_info_##_b##_##_v##_##_n##_##_c; \
return 0
switch (bvnc) {