Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device.h
index 585d98022791c7f299b9d36835ca729946d386fa..b09843e9f1278610a343050b1608e362ef8d7658 100644 (file)
@@ -58,7 +58,6 @@ public:
        bool advanced_shading;          /* Supports full shading system. */
        bool has_half_images;           /* Support half-float textures. */
        bool has_volume_decoupled;      /* Decoupled volume shading. */
-       BVHLayoutMask bvh_layout_mask;  /* Bitmask of supported BVH layouts. */
        bool has_osl;                   /* Support Open Shading Language. */
        bool use_split_kernel;          /* Use split or mega kernel. */
        int cpu_threads;
@@ -74,7 +73,6 @@ public:
                advanced_shading = true;
                has_half_images = false;
                has_volume_decoupled = false;
-               bvh_layout_mask = BVH_LAYOUT_NONE;
                has_osl = false;
                use_split_kernel = false;
        }
@@ -294,6 +292,7 @@ public:
                fflush(stderr);
        }
        virtual bool show_samples() const { return false; }
+       virtual BVHLayoutMask get_bvh_layout_mask() const = 0;
 
        /* statistics */
        Stats &stats;