diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-10-31 13:49:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-10-31 13:49:04 +0300 |
| commit | fc12a736bbd10e488b701ad18fb70934ea8de01b (patch) | |
| tree | 13532ffffbd7fac27474c01c00702041c45d273f /intern/cycles/device/device_cuda.cpp | |
| parent | 14e1dfda4e145fb4d6975fd1531fad149b761bbb (diff) | |
| parent | e0cc3e980999ed97e72b430f0d654b30f60f9313 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 22b1bc493c8..1c2d35061cc 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -181,6 +181,10 @@ public: return true; } + virtual BVHLayoutMask get_bvh_layout_mask() const { + return BVH_LAYOUT_BVH2; + } + /*#ifdef NDEBUG #define cuda_abort() #else @@ -2477,7 +2481,6 @@ void device_cuda_info(vector<DeviceInfo>& devices) info.advanced_shading = (major >= 3); info.has_half_images = (major >= 3); info.has_volume_decoupled = false; - info.bvh_layout_mask = BVH_LAYOUT_BVH2; int pci_location[3] = {0, 0, 0}; cuDeviceGetAttribute(&pci_location[0], CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, num); |