diff options
Diffstat (limited to 'intern/cycles/blender/display_driver.h')
| -rw-r--r-- | intern/cycles/blender/display_driver.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/intern/cycles/blender/display_driver.h b/intern/cycles/blender/display_driver.h index 58867d08e19..4df40269daf 100644 --- a/intern/cycles/blender/display_driver.h +++ b/intern/cycles/blender/display_driver.h @@ -89,7 +89,7 @@ class BlenderDisplaySpaceShader : public BlenderDisplayShader { /* Display driver implementation which is specific for Blender viewport integration. */ class BlenderDisplayDriver : public DisplayDriver { public: - BlenderDisplayDriver(BL::RenderEngine &b_engine, BL::Scene &b_scene); + BlenderDisplayDriver(BL::RenderEngine &b_engine, BL::Scene &b_scene, const bool background); ~BlenderDisplayDriver(); virtual void graphics_interop_activate() override; @@ -115,23 +115,18 @@ class BlenderDisplayDriver : public DisplayDriver { virtual void flush() override; /* Helper function which allocates new GPU context. */ - void gl_context_create(); - bool gl_context_enable(); - void gl_context_disable(); - void gl_context_dispose(); + void gpu_context_create(); + bool gpu_context_enable(); + void gpu_context_disable(); + void gpu_context_destroy(); + void gpu_context_lock(); + void gpu_context_unlock(); /* Destroy all GPU resources which are being used by this object. */ - void gl_resources_destroy(); + void gpu_resources_destroy(); BL::RenderEngine b_engine_; - - /* OpenGL context which is used the render engine doesn't have its own. */ - void *gl_context_ = nullptr; - /* The when Blender RenderEngine side context is not available and the DisplayDriver is to create - * its own context. */ - bool use_gl_context_ = false; - /* Mutex used to guard the `gl_context_`. */ - thread_mutex gl_context_mutex_; + bool background_; /* Content of the display is to be filled with zeroes. */ std::atomic<bool> need_clear_ = true; |