Mesa (master): amd/addrlib: fix another C++ one definition rule violation

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sun Jun 28 01:29:40 2020 +0200

amd/addrlib: fix another C++ one definition rule violation

Clashes with the SI definition.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3116
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5673>

---

 src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h | 2 +-
 src/amd/addrlib/src/gfx10/gfx10addrlib.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
index 8526171c7bc..93f250716b6 100644
--- a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
+++ b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h
@@ -45,7 +45,7 @@
 #define BIGENDIAN_CPU
 #endif
 
-union GB_ADDR_CONFIG
+union GB_ADDR_CONFIG_gfx10
 {
     struct
     {
diff --git a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
index 4033c2398d7..ec05f3a3dd8 100644
--- a/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
+++ b/src/amd/addrlib/src/gfx10/gfx10addrlib.cpp
@@ -755,7 +755,7 @@ BOOL_32 Gfx10Lib::HwlInitGlobalParams(
     const ADDR_CREATE_INPUT* pCreateIn) ///< [in] create input
 {
     BOOL_32        valid = TRUE;
-    GB_ADDR_CONFIG gbAddrConfig;
+    GB_ADDR_CONFIG_gfx10 gbAddrConfig;
 
     gbAddrConfig.u32All = pCreateIn->regValue.gbAddrConfig;