diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-06-03 20:02:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-06-03 20:02:46 +0300 |
commit | da45c12beff41aaa46b2480de80b3b941c862029 (patch) | |
tree | f4bbf7a7ad860d1c245a954f342bbf9bc9ac4a67 /intern/cycles/hydra/display_driver.h | |
parent | 3fe7d049d21b4ad939ea8fb2df1f80c4f107a699 (diff) | |
parent | 34f94a02f37005210f629f04635c457d98ff5f91 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'intern/cycles/hydra/display_driver.h')
-rw-r--r-- | intern/cycles/hydra/display_driver.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/hydra/display_driver.h b/intern/cycles/hydra/display_driver.h index 20086830e6a..2a05397c325 100644 --- a/intern/cycles/hydra/display_driver.h +++ b/intern/cycles/hydra/display_driver.h @@ -19,9 +19,6 @@ class HdCyclesDisplayDriver final : public CCL_NS::DisplayDriver { ~HdCyclesDisplayDriver(); private: - void init(); - void deinit(); - void next_tile_begin() override; bool update_begin(const Params ¶ms, int texture_width, int texture_height) override; @@ -41,6 +38,11 @@ class HdCyclesDisplayDriver final : public CCL_NS::DisplayDriver { void draw(const Params ¶ms) override; + void gl_context_create(); + bool gl_context_enable(); + void gl_context_disable(); + void gl_context_dispose(); + HdCyclesSession *const _renderParam; Hgi *const _hgi; @@ -48,7 +50,6 @@ class HdCyclesDisplayDriver final : public CCL_NS::DisplayDriver { void *hdc_ = nullptr; void *gl_context_ = nullptr; #endif - CCL_NS::thread_mutex mutex_; PXR_NS::HgiTextureHandle texture_; |