summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Natalie <jenatali@microsoft.com>2020-12-03 18:20:52 +0000
committerMarge Bot <eric+marge@anholt.net>2020-12-04 16:33:37 +0000
commitf66236617cd52a7c0d5e27f3941c2e7390def2f2 (patch)
tree58c24e1bca0bb9447cc4d4b36793b381ce8cefd6
parente476c1819634c839c31228b616f53ea2baaa61dd (diff)
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 <marcin.slusarz@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7905>
-rw-r--r--src/gallium/frontends/clover/core/device.cpp2
1 files changed, 1 insertions, 1 deletions
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