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

Support more AOVs #78

Merged
Bogdan Nagirniak merged 11 commits from DagerD/blender:BLEN-462_3 into hydra-render 2023-07-29 14:45:16 +02:00
Conversation 0 Commits 11 Files Changed 11 +8 -12
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e247033e3 - Show all commits

2
source/blender/render/hydra/camera.cc
View File

@ -240,7 +240,7 @@ pxr::GfCamera CameraData::gf_camera(pxr::GfVec4f tile)
switch (mode_) { switch (mode_) {
case CAM_PERSP: case CAM_PERSP:
case CAM_PANO: { case CAM_PANO: {
/* TODO: store panoramic camera settings */ /* TODO: store panoramic camera settings */
gf_camera.SetProjection(pxr::GfCamera::Projection::Perspective); gf_camera.SetProjection(pxr::GfCamera::Projection::Perspective);
gf_camera.SetFocalLength(focal_length_); gf_camera.SetFocalLength(focal_length_);

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

@ -27,8 +27,6 @@ Engine::Engine(RenderEngine *bl_engine, const std::string &render_delegate_name)
pxr::TF_PY_ALLOW_THREADS_IN_SCOPE(); pxr::TF_PY_ALLOW_THREADS_IN_SCOPE();
/* USD has limited support for Vulkan. To make it works USD should be built
* with PXR_ENABLE_VULKAN_SUPPORT=TRUE which is not possible now */
if (GPU_backend_get_type() == GPU_BACKEND_VULKAN) { if (GPU_backend_get_type() == GPU_BACKEND_VULKAN) {
BLI_setenv("HGI_ENABLE_VULKAN", "1"); BLI_setenv("HGI_ENABLE_VULKAN", "1");
} }

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

@ -20,8 +20,6 @@ PXR_NAMESPACE_CLOSE_SCOPE
namespace blender::render::hydra { namespace blender::render::hydra {
/* FinalEngine implementation */
void FinalEngine::render(Depsgraph *depsgraph) void FinalEngine::render(Depsgraph *depsgraph)
{ {
const Scene *scene = DEG_get_evaluated_scene(depsgraph); const Scene *scene = DEG_get_evaluated_scene(depsgraph);

4
source/blender/render/hydra/light_tasks_delegate.cc
View File

@ -42,8 +42,8 @@ pxr::HdTaskSharedPtr LightTasksDelegate::simple_task()
pxr::HdTaskSharedPtr LightTasksDelegate::skydome_task() pxr::HdTaskSharedPtr LightTasksDelegate::skydome_task()
{ {
/* Note that this task is intended to be the first "Render Task", /* Note that this task is intended to be the first "Render Task",
so that the AOV's are properly cleared, however it * so that the AOV's are properly cleared, however it
does not spawn a HdRenderPass. */ * does not spawn a HdRenderPass. */
return GetRenderIndex().GetTask(skydome_task_id_); return GetRenderIndex().GetTask(skydome_task_id_);
} }

10
source/blender/render/hydra/scene_delegate/instancer.h
View File

@ -43,11 +43,11 @@ class InstancerData : public IdData {
void update_double_sided(MaterialData *mat_data); void update_double_sided(MaterialData *mat_data);
/* Following update functions are working together: /* Following update functions are working together:
pre_update() * pre_update()
update_instance() * update_instance()
update_instance() * update_instance()
... * ...
post_update() */ * post_update() */
void pre_update(); void pre_update();
void update_instance(Object *parent_ob, DupliObject *dupli); void update_instance(Object *parent_ob, DupliObject *dupli);
void post_update(); void post_update();