Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa
Commits: 6dfd9872 by Timo Aaltonen at 2021-05-17T10:37:57+03:00 fix-ftbfs.diff: Fix build on armel/armhf/mipsel. - - - - - eec3f149 by Timo Aaltonen at 2021-05-17T10:38:15+03:00 release to experimental - - - - - 3 changed files: - debian/changelog - + debian/patches/fix-ftbfs.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +mesa (21.1.0-4) experimental; urgency=medium + + * fix-ftbfs.diff: Fix build on armel/armhf/mipsel. + + -- Timo Aaltonen <[email protected]> Mon, 17 May 2021 10:38:04 +0300 + mesa (21.1.0-3) experimental; urgency=medium * rules: Drop the rule to clean up vulkan headers, not needed anymore. ===================================== debian/patches/fix-ftbfs.diff ===================================== @@ -0,0 +1,83 @@ +diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c +index 8c2f90fc8cc9567acd6c875a05f52a74e4fb5f0e..b017699979c5f662ab87271c9c6b8180e9fa857d 100644 +--- a/src/amd/common/ac_surface_modifier_test.c ++++ b/src/amd/common/ac_surface_modifier_test.c +@@ -24,7 +24,7 @@ + * not change the meaning of existing modifiers. + */ + +-struct test_entry { ++struct ALIGN32 test_entry { + /* key part */ + uint64_t modifier; + unsigned w; +@@ -32,20 +32,14 @@ struct test_entry { + enum pipe_format format; + + /* debug info */ +- const char *name; + uint8_t pipes; + uint8_t rb; + uint8_t banks_or_pkrs; + uint8_t se; ++ const char *name; + + /* value to determine uniqueness */ + unsigned char hash[20]; +- +- /* u_vector requires power of two sizing */ +- char padding[8]; +-#ifdef PIPE_ARCH_X86 +- char padding2[8]; +-#endif + }; + + static uint64_t +@@ -234,19 +228,19 @@ static void test_modifier(const struct radeon_info *info, + }, + }; + +- struct test_entry entry = { +- .modifier = modifier, +- .w = config.info.width, +- .h = config.info.height, +- .format = format, +- .name = name, +- .pipes = G_0098F8_NUM_PIPES(info->gb_addr_config), +- .rb = G_0098F8_NUM_RB_PER_SE(info->gb_addr_config) + +- G_0098F8_NUM_SHADER_ENGINES_GFX9(info->gb_addr_config), +- .se = G_0098F8_NUM_SHADER_ENGINES_GFX9(info->gb_addr_config), +- .banks_or_pkrs = info->chip_class >= GFX10 ? +- (info->gb_addr_config) : G_0098F8_NUM_BANKS(info->gb_addr_config) +- }; ++ struct test_entry entry; ++ memset(&entry, 0, sizeof(entry)); ++ entry.modifier = modifier; ++ entry.w = config.info.width; ++ entry.h = config.info.height; ++ entry.format = format; ++ entry.name = name; ++ entry.pipes = G_0098F8_NUM_PIPES(info->gb_addr_config); ++ entry.rb = G_0098F8_NUM_RB_PER_SE(info->gb_addr_config) + ++ G_0098F8_NUM_SHADER_ENGINES_GFX9(info->gb_addr_config); ++ entry.se = G_0098F8_NUM_SHADER_ENGINES_GFX9(info->gb_addr_config); ++ entry.banks_or_pkrs = info->chip_class >= GFX10 ? ++ (info->gb_addr_config) : G_0098F8_NUM_BANKS(info->gb_addr_config); + + struct radeon_surf surf = (struct radeon_surf) { + .blk_w = 1, +diff --git a/src/util/macros.h b/src/util/macros.h +index 1fc9e23355b0b418ad7d2597dd2b76647e2d3087..7cd666c1395ddcae7b63bb2ce54142d86b435725 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -234,8 +234,10 @@ do { \ + + #ifdef _MSC_VER + #define ALIGN16 __declspec(align(16)) ++#define ALIGN32 __declspec(align(32)) + #else + #define ALIGN16 __attribute__((aligned(16))) ++#define ALIGN32 __attribute__((aligned(32))) + #endif + + #ifdef __cplusplus ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ fix-python-shebang.diff path_max.diff src_glx_dri_common.h.diff +fix-ftbfs.diff View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/6383f7b9f3bc10389556eab720929195f509518a...eec3f1498360c1749936e96982453f0870cb58bc -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/6383f7b9f3bc10389556eab720929195f509518a...eec3f1498360c1749936e96982453f0870cb58bc You're receiving this email because of your account on salsa.debian.org.
