From c69ee218d786e6ae24804b00e7a7856c7638f7b0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 9 Feb 2022 16:15:56 +0100 Subject: Revert "Fix size_t -> int -> size_t round trip in Cycles" This reverts commit d74bb7be1916744ae56347b49333eac22ebb7339. Need to re-iterate to have a proper support of all platforms. --- intern/cycles/util/math.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/math.h b/intern/cycles/util/math.h index a580a21c28b..605a19aaef0 100644 --- a/intern/cycles/util/math.h +++ b/intern/cycles/util/math.h @@ -124,12 +124,7 @@ ccl_device_inline int min(int a, int b) return (a < b) ? a : b; } -ccl_device_inline uint32_t min(uint32_t a, uint32_t b) -{ - return (a < b) ? a : b; -} - -ccl_device_inline uint64_t min(uint64_t a, uint64_t b) +ccl_device_inline uint min(uint a, uint b) { return (a < b) ? a : b; } -- cgit v1.2.3