Mesa (main): gallium: use c11 alignas instead of PIPE_ALIGN_VAR
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 14 15:50:07 UTC 2022
Module: Mesa
Branch: main
Commit: 04ca04ba46eb49ef46725b1e0fd7430d9aae4b9a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04ca04ba46eb49ef46725b1e0fd7430d9aae4b9a
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Jun 8 11:01:31 2022 +0200
gallium: use c11 alignas instead of PIPE_ALIGN_VAR
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16908>
---
src/gallium/auxiliary/gallivm/lp_bld_format.h | 2 +-
src/gallium/auxiliary/translate/translate_sse.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format.h b/src/gallium/auxiliary/gallivm/lp_bld_format.h
index ad7f6f51c6e..425b2f572f5 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_format.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format.h
@@ -59,7 +59,7 @@ struct lp_build_context;
*/
struct lp_build_format_cache
{
- PIPE_ALIGN_VAR(16) uint32_t cache_data[LP_BUILD_FORMAT_CACHE_SIZE][4][4];
+ alignas(16) uint32_t cache_data[LP_BUILD_FORMAT_CACHE_SIZE][4][4];
uint64_t cache_tags[LP_BUILD_FORMAT_CACHE_SIZE];
#if LP_BUILD_FORMAT_CACHE_DEBUG
uint64_t cache_access_total;
diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c
index 91f0ea6e4cd..0ab79e4a361 100644
--- a/src/gallium/auxiliary/translate/translate_sse.c
+++ b/src/gallium/auxiliary/translate/translate_sse.c
@@ -111,8 +111,8 @@ struct translate_sse
struct x86_function elt8_func;
struct x86_function *func;
- PIPE_ALIGN_VAR(16) float consts[NUM_FLOAT_CONSTS][4];
- PIPE_ALIGN_VAR(16) float uconsts[NUM_UNSIGNED_CONSTS][4];
+ alignas(16) float consts[NUM_FLOAT_CONSTS][4];
+ alignas(16) float uconsts[NUM_UNSIGNED_CONSTS][4];
int8_t reg_to_const[16];
int8_t const_to_reg[NUM_FLOAT_CONSTS + NUM_UNSIGNED_CONSTS];
More information about the mesa-commit
mailing list