Module: Mesa Branch: master Commit: f66236617cd52a7c0d5e27f3941c2e7390def2f2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f66236617cd52a7c0d5e27f3941c2e7390def2f2
Author: Jesse Natalie <[email protected]> Date: Thu Dec 3 18:20:52 2020 +0000 clover/core: Fix x86 build I unintentionally removed this size_t cast, which is required for std::max to infer its single template arg. Fixes: f88347cd ("clover/core: Support MSVC") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3920 Reviewed-by: Marcin Slusarz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7905> --- src/gallium/frontends/clover/core/device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/frontends/clover/core/device.cpp b/src/gallium/frontends/clover/core/device.cpp index e861bab1e14..0a8fa50d338 100644 --- a/src/gallium/frontends/clover/core/device.cpp +++ b/src/gallium/frontends/clover/core/device.cpp @@ -236,7 +236,7 @@ size_t device::mem_base_addr_align() const { uint64_t page_size = 0; os_get_page_size(&page_size); - return std::max(page_size, sizeof(cl_long) * 16); + return std::max((size_t)page_size, sizeof(cl_long) * 16); } cl_device_svm_capabilities _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
