Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device_cuda.cpp
index 22b1bc493c848b67c4aa67773342cc99bdf1edd3..1c2d35061cc5edf4cd2565293782e6021d83f7fc 100644 (file)
@@ -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);