Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device.h
index 5d1308c30304abe9b52b7b4777b525cb1f295fc8..c620914aab4f2fec80e432fbb5390f4f865bb1be 100644 (file)
@@ -60,6 +60,7 @@ public:
        bool has_volume_decoupled;      /* Decoupled volume shading. */
        bool has_osl;                   /* Support Open Shading Language. */
        bool use_split_kernel;          /* Use split or mega kernel. */
+       bool has_profiling;             /* Supports runtime collection of profiling info. */
        int cpu_threads;
        vector<DeviceInfo> multi_devices;
 
@@ -75,6 +76,7 @@ public:
                has_volume_decoupled = false;
                has_osl = false;
                use_split_kernel = false;
+               has_profiling = false;
        }
 
        bool operator==(const DeviceInfo &info) {