From d33fe53c8d8a80ed98690a32264d6f08e123a4b0 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 23 May 2022 14:49:06 +0200 Subject: [PATCH] freedreno: do not do STATIC_ASSERT on variables Reviewed-by: Jesse Natalie Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_pack.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_pack.h b/src/gallium/drivers/freedreno/a6xx/fd6_pack.h index 50d95a514da..ada71da2e4a 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_pack.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_pack.h @@ -74,8 +74,8 @@ struct fd_reg_pair { const struct fd_reg_pair regs[] = {__VA_ARGS__}; \ unsigned count = ARRAY_SIZE(regs); \ \ - STATIC_ASSERT(count > 0); \ - STATIC_ASSERT(count <= 16); \ + STATIC_ASSERT(ARRAY_SIZE(regs) > 0); \ + STATIC_ASSERT(ARRAY_SIZE(regs) <= 16); \ \ BEGIN_RING(ring, count + 1); \ uint32_t *p = ring->cur; \ @@ -105,7 +105,7 @@ struct fd_reg_pair { const struct fd_reg_pair regs[] = {__VA_ARGS__}; \ unsigned count = ARRAY_SIZE(regs); \ \ - STATIC_ASSERT(count <= 16); \ + STATIC_ASSERT(ARRAY_SIZE(regs) <= 16); \ \ BEGIN_RING(ring, count + 1); \ uint32_t *p = ring->cur; \ @@ -139,7 +139,7 @@ struct fd_reg_pair { const struct fd_reg_pair regs[] = {__VA_ARGS__}; \ unsigned count = ARRAY_SIZE(regs); \ \ - STATIC_ASSERT(count <= 16); \ + STATIC_ASSERT(ARRAY_SIZE(regs) <= 16); \ count += sizedwords; \ \ BEGIN_RING(ring, count + 1); \