Mesa (main): aco/tests: fix 32-bit build

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jun 29 10:10:58 UTC 2021


Module: Mesa
Branch: main
Commit: ebeda078016ba7c81af670375910c05553ff1918
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebeda078016ba7c81af670375910c05553ff1918

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue Jun 22 13:43:33 2021 +0100

aco/tests: fix 32-bit build

"call of overloaded ‘Operand(long unsigned int)’ is ambiguous"

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11627>

---

 src/amd/compiler/tests/test_optimizer_postRA.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/tests/test_optimizer_postRA.cpp b/src/amd/compiler/tests/test_optimizer_postRA.cpp
index dec5e49f568..31b70f29824 100644
--- a/src/amd/compiler/tests/test_optimizer_postRA.cpp
+++ b/src/amd/compiler/tests/test_optimizer_postRA.cpp
@@ -198,7 +198,7 @@ BEGIN_TEST(optimizer_postRA.scc_nocmp_opt)
         //! s2: %f:vcc = p_cbranch_z %e:scc
         //! p_unit_test 4, %f:vcc
         auto salu = bld.sop2(aco_opcode::s_and_b64, bld.def(s2, reg_s2), bld.def(s1, scc), op_in_1, Operand(0x12345u));
-        auto scmp = bld.sopc(aco_opcode::s_cmp_eq_u64, bld.def(s1, scc), Operand(salu, reg_s2), Operand(0UL));
+        auto scmp = bld.sopc(aco_opcode::s_cmp_eq_u64, bld.def(s1, scc), Operand(salu, reg_s2), Operand(UINT64_C(0)));
         auto br = bld.branch(aco_opcode::p_cbranch_nz, bld.def(s2, vcc), bld.scc(scmp));
         writeout(4, Operand(br, vcc));
     }



More information about the mesa-commit mailing list