Mesa (main): freedreno: do not do STATIC_ASSERT on variables
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 3 07:49:47 UTC 2022
Module: Mesa
Branch: main
Commit: d33fe53c8d8a80ed98690a32264d6f08e123a4b0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d33fe53c8d8a80ed98690a32264d6f08e123a4b0
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Mon May 23 14:49:06 2022 +0200
freedreno: do not do STATIC_ASSERT on variables
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16670>
---
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); \
More information about the mesa-commit
mailing list