BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Rename some functions #25

Merged
Bogdan Nagirniak merged 13 commits from BLEN-388 into hydra-render 2023-04-18 09:07:35 +02:00
Conversation 0 Commits 13 Files Changed 33 +2 -14
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9bea6a6e94 - Show all commits

13
source/blender/render/hydra/engine.cc
View File

@ -44,19 +44,6 @@ Engine::Engine(RenderEngine *bl_engine, const std::string &delegate_id) : bl_eng
engine_ = std::make_unique<pxr::HdEngine>(); engine_ = std::make_unique<pxr::HdEngine>();
} }
Engine::~Engine()
{
/* Destructor must exists and keep deletion order */
scene_delegate_ = nullptr;
render_task_delegate_ = nullptr;
free_camera_delegate_ = nullptr;
simple_light_task_delegate_ = nullptr;
render_index_ = nullptr;
render_delegate_ = nullptr;
engine_ = nullptr;
hgi_ = nullptr;
}
float Engine::renderer_percent_done() float Engine::renderer_percent_done()
{ {
pxr::VtDictionary render_stats = render_delegate_->GetRenderStats(); pxr::VtDictionary render_stats = render_delegate_->GetRenderStats();

3
source/blender/render/hydra/engine.h
View File

@ -26,7 +26,7 @@ extern struct CLG_LogRef *LOG_EN; /* EN - Engine */
class Engine { class Engine {
public: public:
Engine(RenderEngine *bl_engine, const std::string &render_delegate_id); Engine(RenderEngine *bl_engine, const std::string &render_delegate_id);
virtual ~Engine(); virtual ~Engine() {};
virtual void sync(Depsgraph *depsgraph, virtual void sync(Depsgraph *depsgraph,
bContext *context, bContext *context,
@ -38,6 +38,7 @@ class Engine {
RenderEngine *bl_engine_; RenderEngine *bl_engine_;
/* The order is important due to deletion order */
pxr::HdPluginRenderDelegateUniqueHandle render_delegate_; pxr::HdPluginRenderDelegateUniqueHandle render_delegate_;
std::unique_ptr<pxr::HdRenderIndex> render_index_; std::unique_ptr<pxr::HdRenderIndex> render_index_;
std::unique_ptr<BlenderSceneDelegate> scene_delegate_; std::unique_ptr<BlenderSceneDelegate> scene_delegate_;