Merge branch 'master' into temp-gpencil-drw-engine

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

1 files changed, 16 insertions, 0 deletions

diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h
index 83d9e96ffa5..cf6b442b878 100644
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/util_debug.h
@@ -33,6 +33,8 @@ class DebugFlags {
   /* Use static BVH in viewport, to match final render exactly. */
   bool viewport_static_bvh;
 
+  bool running_inside_blender;
+
   /* Descriptor of CPU feature-set to be used. */
   struct CPU {
     CPU();
@@ -97,6 +99,17 @@ class DebugFlags {
     bool split_kernel;
   };
 
+  /* Descriptor of OptiX feature-set to be used. */
+  struct OptiX {
+    OptiX();
+
+    /* Reset flags to their defaults. */
+    void reset();
+
+    /* Number of CUDA streams to launch kernels concurrently from. */
+    int cuda_streams;
+  };
+
   /* Descriptor of OpenCL feature-set to be used. */
   struct OpenCL {
     OpenCL();
@@ -163,6 +176,9 @@ class DebugFlags {
   /* Requested CUDA flags. */
   CUDA cuda;
 
+  /* Requested OptiX flags. */
+  OptiX optix;
+
   /* Requested OpenCL flags. */
   OpenCL opencl;