Mesa (master): freedreno/log: fix build error

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Apr 1 01:11:02 UTC 2020


Module: Mesa
Branch: master
Commit: 59754409cc6e9c9e8f9f82a4a523e7370c373a07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59754409cc6e9c9e8f9f82a4a523e7370c373a07

Author: Rob Clark <robdclark at chromium.org>
Date:   Tue Mar 31 08:31:00 2020 -0700

freedreno/log: fix build error

It seems some versions of gcc are less clever about const initializers:

```
../src/gallium/drivers/freedreno/freedreno_log.c:58:33: error: initializer element is not constant
 const unsigned msgs_per_chunk = bo_size / sizeof(uint64_t);
                                 ^~~~~~~
```

See https://gitlab.freedesktop.org/mesa/mesa/-/issues/2713

Signed-off-by: Rob Clark <robdclark at chromium.org>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4390>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4390>

---

 src/gallium/drivers/freedreno/freedreno_log.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_log.c b/src/gallium/drivers/freedreno/freedreno_log.c
index c1fe4da8142..8eb1966aabf 100644
--- a/src/gallium/drivers/freedreno/freedreno_log.c
+++ b/src/gallium/drivers/freedreno/freedreno_log.c
@@ -54,8 +54,10 @@
  * for profiling at that level.
  */
 
-const unsigned bo_size = 0x1000;
-const unsigned msgs_per_chunk = bo_size / sizeof(uint64_t);
+enum {
+	bo_size = 0x1000,
+	msgs_per_chunk = bo_size / sizeof(uint64_t),
+};
 
 struct fd_log_chunk {
 	struct list_head node;



More information about the mesa-commit mailing list