blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cycles: Detect out of memory before buffer allocation in OpenCL devices

This commit is contained in:
Mai Lavelle 2017-07-05 19:44:18 -04:00
parent cff172c762
commit 222b96e5c7
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/device/opencl/opencl_base.cpp
View File

@ -276,6 +276,20 @@ void OpenCLDeviceBase::mem_alloc(const char *name, device_memory& mem, MemoryTyp
size_t size = mem.memory_size();
/* check there is enough memory available for the allocation */
cl_ulong max_alloc_size = 0;
clGetDeviceInfo(cdDevice, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(cl_ulong), &max_alloc_size, NULL);
if(size > max_alloc_size) {
string error = "Scene too complex to fit in available memory.";
if(name != NULL) {
error += string_printf(" (allocating buffer %s failed.)", name);
}
set_error(error);
return;
}
cl_mem_flags mem_flag;
void *mem_ptr = NULL;