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 +10 -6
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a935ea75fd - Show all commits

2
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,

9
source/blender/render/hydra/final_engine.cc
View File

@ -196,8 +196,13 @@ void FinalEngineGL::render(Depsgraph *depsgraph)
std::vector<float> &pixels = render_images["Combined"]; std::vector<float> &pixels = render_images["Combined"];
GPUFrameBuffer *framebuffer = GPU_framebuffer_create("fb_hdyra_render_final"); GPUFrameBuffer *framebuffer = GPU_framebuffer_create("fb_hdyra_render_final");
GPUTexture *texture = GPU_texture_create_2d( GPUTexture *texture = GPU_texture_create_2d("tex_hydra_render_final",
"tex_hydra_render_final", res[0], res[1], 1, GPU_RGBA32F, GPU_TEXTURE_USAGE_GENERAL, nullptr); res[0],
res[1],
1,
GPU_RGBA32F,
GPU_TEXTURE_USAGE_GENERAL,
nullptr);
GPU_texture_filter_mode(texture, true); GPU_texture_filter_mode(texture, true);
GPU_texture_mipmap_mode(texture, true, true); GPU_texture_mipmap_mode(texture, true, true);
GPU_framebuffer_texture_attach(framebuffer, texture, 0, 0); GPU_framebuffer_texture_attach(framebuffer, texture, 0, 0);

3
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc
View File

@ -16,8 +16,7 @@ CLG_LOGREF_DECLARE_GLOBAL(LOG_BSD, "rhd.bsd");
BlenderSceneDelegate::BlenderSceneDelegate(pxr::HdRenderIndex *parent_index, BlenderSceneDelegate::BlenderSceneDelegate(pxr::HdRenderIndex *parent_index,
pxr::SdfPath const &delegate_id, pxr::SdfPath const &delegate_id,
BlenderSceneDelegate::EngineType engine_type) BlenderSceneDelegate::EngineType engine_type)
: HdSceneDelegate(parent_index, delegate_id), : HdSceneDelegate(parent_index, delegate_id), engine_type(engine_type)
engine_type(engine_type)
{ {
} }

2
source/blender/render/hydra/scene_delegate/blender_scene_delegate.h
View File

@ -70,7 +70,7 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
bContext *context_ = nullptr; bContext *context_ = nullptr;
View3D *view3d_ = nullptr; View3D *view3d_ = nullptr;
Scene *scene_; Scene *scene_;
DagerD marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-04-14 14:20:30 +02:00
Outdated
Review
Copy Link

= nullptr

`= nullptr`
ObjectDataMap objects_; ObjectDataMap objects_;
MaterialDataMap materials_; MaterialDataMap materials_;
std::unique_ptr<WorldData> world_data_; std::unique_ptr<WorldData> world_data_;