diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c18710fd48..89e4e76a8fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -369,7 +369,7 @@ mark_as_advanced(WITH_LIBMV_SCHUR_SPECIALIZATIONS) # Logging/unbit test libraries. option(WITH_SYSTEM_GFLAGS "Use system-wide Gflags instead of a bundled one" OFF) -option(WITH_SYSTEM_GFLOG "Use system-wide Glog instead of a bundled one" OFF) +option(WITH_SYSTEM_GLOG "Use system-wide Glog instead of a bundled one" OFF) mark_as_advanced(WITH_SYSTEM_GFLAGS) mark_as_advanced(WITH_SYSTEM_GLOG) diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 3532e640eaa..e497ec6b0e1 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -119,6 +119,7 @@ public: int cuDevId; int cuDevArchitecture; bool first_error; + CUDASplitKernel *split_kernel; struct PixelMem { GLuint cuPBO; @@ -221,6 +222,8 @@ public: cuDevice = 0; cuContext = 0; + split_kernel = NULL; + need_bindless_mapping = false; /* intialize */ @@ -260,6 +263,8 @@ public: { task_pool.stop(); + delete split_kernel; + if(info.has_bindless_textures) { tex_free(bindless_mapping); } @@ -1357,12 +1362,14 @@ public: requested_features.max_closure = 64; } - CUDASplitKernel split_kernel(this); - split_kernel.load_kernels(requested_features); + if(split_kernel == NULL) { + split_kernel = new CUDASplitKernel(this); + split_kernel->load_kernels(requested_features); + } while(task->acquire_tile(this, tile)) { device_memory void_buffer; - split_kernel.path_trace(task, tile, void_buffer, void_buffer); + split_kernel->path_trace(task, tile, void_buffer, void_buffer); task->release_tile(tile); @@ -1648,7 +1655,8 @@ int2 CUDASplitKernel::split_kernel_global_size(device_memory& kg, device_memory& << string_human_readable_size(free) << ")."; size_t num_elements = max_elements_for_max_buffer_size(kg, data, free / 2); - int2 global_size = make_int2(round_down((int)sqrt(num_elements), 32), (int)sqrt(num_elements)); + size_t side = round_down((int)sqrt(num_elements), 32); + int2 global_size = make_int2(side, round_down(num_elements / side, 16)); VLOG(1) << "Global size: " << global_size << "."; return global_size; } |