diff options
author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2020-05-20 15:26:29 +0200 |
---|---|---|
committer | Eric Engestrom <eric@engestrom.ch> | 2020-05-27 21:54:15 +0200 |
commit | 1a6c365774acaea8b0fea2906f58bfb6539fe8f7 (patch) | |
tree | 456bbddd5c45d2f708be9c92210cb152609140ce | |
parent | 511d89f0ad657f8d0a627ae90b81168a8e981a99 (diff) |
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@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5119>
(cherry picked from commit dddd91eef326dbcdaec2a7fee6fa429d1cf6542a)
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | 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 5b757aac07a..464c41da2dc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1453,7 +1453,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; } |