[Bf-blender-cvs] [0f72e7c3ebb] blender-v2.90-release: Fix OpenCL render error in large scenes

[Brecht Van Lommel]

Commit: 0f72e7c3ebb188001b29a54650272ab2fd3d9074
Author: Brecht Van Lommel
Date:   Thu Sep 17 13:07:28 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB0f72e7c3ebb188001b29a54650272ab2fd3d9074

Fix OpenCL render error in large scenes

In scenes such as Cosmos Laundromat, there were memory allocations bigger than
2GB which would overflow.

Problem and solution found by AMD, thanks!

===================================================================

M	intern/cycles/device/opencl/memory_manager.cpp

===================================================================

diff --git a/intern/cycles/device/opencl/memory_manager.cpp b/intern/cycles/device/opencl/memory_manager.cpp
index 0285dc969ec..4330e07cb37 100644
--- a/intern/cycles/device/opencl/memory_manager.cpp
+++ b/intern/cycles/device/opencl/memory_manager.cpp
@@ -65,7 +65,7 @@ void MemoryManager::DeviceBuffer::update_device_memory(OpenCLDevice *device)
   }
 
   /* Always allocate non-empty buffer, NULL pointers cause problems with some drivers. */
-  total_size = max(total_size, 16);
+  total_size = std::max(total_size, (size_t)16);
 
   if (need_realloc) {
     cl_ulong max_buffer_size;