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

Fixed rendering for MacOS #82

Merged
Bogdan Nagirniak merged 10 commits from BLEN-473 into hydra-render 2023-08-02 09:37:25 +02:00
Conversation 1 Commits 10 Files Changed 9 +70 -37
Bogdan Nagirniak commented 2023-07-31 21:19:51 +02:00
Owner
Copy Link

Purpose

Crash on MacOS. Fix of #70

Technical steps

  1. For MacOS RenderTaskDelegate is created instead of GPURenderTaskDelegate.
  2. Disabled skydome_task for MacOS.
  3. Improved some logging.

Notes

Need to fix Skydome.

### Purpose Crash on MacOS. Fix of #70 ### Technical steps 1. For MacOS `RenderTaskDelegate` is created instead of `GPURenderTaskDelegate`. 2. Disabled `skydome_task` for MacOS. 3. Improved some logging. ### Notes Need to fix Skydome.
Bogdan Nagirniak added 4 commits 2023-07-31 21:20:12 +02:00
Bogdan Nagirniak requested review from Brian Savery (AMD) 2023-07-31 21:20:49 +02:00
Bogdan Nagirniak requested review from Georgiy Markelov 2023-07-31 21:20:49 +02:00
Bogdan Nagirniak requested review from Vasyl Pidhirskyi 2023-07-31 21:20:50 +02:00
Bogdan Nagirniak added 1 commit 2023-08-01 09:48:25 +02:00
Brecht Van Lommel commented 2023-08-01 15:28:19 +02:00
Collaborator
Copy Link
  1. For MacOS RenderTaskDelegate is created instead of GPURenderTaskDelegate.
  2. Disabled skydome_task for MacOS.

Can you add code comments explaining why? Is this due to (reported?) bugs in USD?

> 1. For MacOS RenderTaskDelegate is created instead of GPURenderTaskDelegate. > 2. Disabled skydome_task for MacOS. Can you add code comments explaining why? Is this due to (reported?) bugs in USD?
Bogdan Nagirniak added 1 commit 2023-08-01 16:44:32 +02:00
9c225e097a More correct usage of GPURenderTaskDelegate. 
Applied `make format` to whole code.
Georgiy Markelov requested changes 2023-08-01 17:16:51 +02:00
Georgiy Markelov left a comment
Collaborator
Copy Link

Comments in code.

Comments in code.
source/blender/render/hydra/render_task_delegate.cc Outdated
@ -128,3 +129,3 @@
}
void RenderTaskDelegate::read_aov(pxr::TfToken const &aov_key, void *data)
void RenderTaskDelegate::read_aov(pxr::TfToken const &aov_key, float *data)
Georgiy Markelov commented 2023-08-01 17:15:45 +02:00
Collaborator
Copy Link

Revert float -> void

Revert `float` -> `void`
BogdanNagirniak marked this conversation as resolved
source/blender/render/hydra/render_task_delegate.cc Outdated
@ -142,0 +143,4 @@
memcpy(data, buf_data, len * sizeof(float));
buffer->Unmap();
}
else if (pxr::HdGetComponentFormat(format) == pxr::HdFormatFloat16) {
Georgiy Markelov commented 2023-08-01 17:16:03 +02:00
Collaborator
Copy Link

Add else

Add `else`
BogdanNagirniak marked this conversation as resolved
source/blender/render/hydra/render_task_delegate.cc Outdated
@ -229,3 +240,3 @@
}
void GPURenderTaskDelegate::read_aov(pxr::TfToken const &aov_key, void *data)
void GPURenderTaskDelegate::read_aov(pxr::TfToken const &aov_key, float *data)
Georgiy Markelov commented 2023-08-01 17:16:16 +02:00
Collaborator
Copy Link

Revert float -> void

Revert `float` -> `void`
BogdanNagirniak marked this conversation as resolved
Brian Savery (AMD) approved these changes 2023-08-01 20:39:33 +02:00
Bogdan Nagirniak added 2 commits 2023-08-02 03:39:28 +02:00
Bogdan Nagirniak added 1 commit 2023-08-02 08:07:43 +02:00
Bogdan Nagirniak added 1 commit 2023-08-02 09:29:19 +02:00
Georgiy Markelov approved these changes 2023-08-02 09:31:51 +02:00
Bogdan Nagirniak merged commit 6132b88c7c into hydra-render 2023-08-02 09:37:25 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Vasyl Pidhirskyi
Brian Savery (AMD)
Georgiy Markelov
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: BogdanNagirniak/blender#82
No description provided.
Delete Branch "BLEN-473"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?