Mesa (staging/20.1): amd/addrlib: fix forgotten char -> enum conversions

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 24bd50fd31f8713e450da4612c7172ca61b37786
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=24bd50fd31f8713e450da4612c7172ca61b37786

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Wed May 20 15:26:29 2020 +0200

amd/addrlib: fix forgotten char -> enum conversions

clang warning:
  result of comparison of constant 115 with expression of type
  'const enum Dim' is always false

Fixes: e3e704c7e7e ("amd/addrlib: Use enum instead of sparse chars to identify dimensions")
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5119>
(cherry picked from commit dddd91eef326dbcdaec2a7fee6fa429d1cf6542a)

---

 .pick_status.json                  | 2 +-
 src/amd/addrlib/src/core/coord.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e679936854e..f6d3ad556e9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -265,7 +265,7 @@
         "description": "amd/addrlib: fix forgotten char -> enum conversions",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e3e704c7e7e46dfda820ea2e96fa4a32d63ef796"
     },
diff --git a/src/amd/addrlib/src/core/coord.cpp b/src/amd/addrlib/src/core/coord.cpp
index b46149e7f83..3cf066daa94 100644
--- a/src/amd/addrlib/src/core/coord.cpp
+++ b/src/amd/addrlib/src/core/coord.cpp
@@ -83,11 +83,11 @@ BOOL_32 Coordinate::operator<(const Coordinate& b)
     }
     else
     {
-        if (dim == 's' || b.dim == 'm')
+        if (dim == DIM_S || b.dim == DIM_M)
         {
             ret = TRUE;
         }
-        else if (b.dim == 's' || dim == 'm')
+        else if (b.dim == DIM_S || dim == DIM_M)
         {
             ret = FALSE;
         }