Assorted updates to the batch renderer #1961
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As there's already an API to change the transformation of a hierarchy right after it's added, this parameter was kinda redundant. But I need to have a way to set an initial "coordinate frame correction" transformation and keep it there, forever, which is what this parameter could do instead -- so now it applies the transform to the immediate child nodes instead, leaving the top-level transformation as an identity.
Need this to achieve a pixel-perfect correspondence with the classic renderer.
Need this for a scenegraph-less rendering.
facebook-github-bot
added
the
CLA Signed
|
Looks good! |
0mdc
approved these changes
Dec 6, 2022
It was in the CUDA interop test already but that one isn't ran on non-CUDA builds.
I don't intend these to be used that much, nevertheless it's good to not do stupidly inefficient things such as allocating and then copying a huge buffer every frame just because "it's fine for a test". It also allows for easy querying of image subranges, which is a nice bonus.
Generalizes blitRgbaToDefault(), which was a bit too limited.
mosra
force-pushed
the
gfx-batch-assorted-updates
branch
from
33923b2
to
53406af
Compare
0mdc
approved these changes
Dec 7, 2022
| @@ -180,22 +180,22 @@ struct RenderTarget::Impl { | |||
|
|
|||
| void renderExit() {} | |||
|
|
|||
| void blitRgbaToDefault() { | |||
| void blitRgbaTo(Mn::GL::AbstractFramebuffer& target, | |||
| const Mn::Range2Di& targetRectangle) { | |||
There was a problem hiding this comment.
Thanks for that! I was doing the same thing on my side to visualize all batch renderer environments side-by-side.
| @@ -164,13 +165,42 @@ Mn::Image2D RendererStandalone::colorImage() { | |||
| colorFramebufferFormat()); | |||
| } | |||
|
|
|||
| void RendererStandalone::colorImageInto(const Magnum::Range2Di& rectangle, | |||
| const Mn::MutableImageView2D& image) { | |||
There was a problem hiding this comment.
Nitpick: I would rename colorImageInto and depthImageInto to something a bit more explicit.
mosra
added a commit
to 0mdc/habitat-sim
that referenced
this pull request
Dec 7, 2022
…rge it cleanly. Because there's a thing called clang-format which makes any clean merges just straight impossible. Yay!
0mdc
added a commit
that referenced
this pull request
Dec 19, 2022
…erer into it (#1947) * Decouple SceneNode from replay player callbacks. * Move replay player callbacks into a struct. * Decouple gfx-replay player from scene graph. * Code format. * Standardize header guard in PlayerCallbacks.h. * Minor fixes. * Clean up code. * Code clean up. * Minor fixes. * Change createSceneGraphPlayerCallbacks description. * Avoid copying PlayerCallbacks when constructing player instances. Other minor fixes. * gfx_batch: change addMeshHierarchy() to bake in the initial transform. As there's already an API to change the transformation of a hierarchy right after it's added, this parameter was kinda redundant. But I need to have a way to set an initial "coordinate frame correction" transformation and keep it there, forever, which is what this parameter could do instead -- so now it applies the transform to the immediate child nodes instead, leaving the top-level transformation as an identity. * gfx_batch: actually test the images for import success. * gfx_batch: opt-in flag to generate image mipmaps. Need this to achieve a pixel-perfect correspondence with the classic renderer. * gfx_batch: forgot to assert on scene ID bounds here. * sensor: add projection matrix calculation directly on CameraSensorSpec. Need this for a scenegraph-less rendering. * [wip] dirty, DO NOT LOOK * gfx_batch: wait what is the product() nonsense?? * gfx_renderer: properly test the depth image retrieval too. It was in the CUDA interop test already but that one isn't ran on non-CUDA builds. * gfx_batch: add a more efficient way to get images on the CPU. I don't intend these to be used that much, nevertheless it's good to not do stupidly inefficient things such as allocating and then copying a huge buffer every frame just because "it's fine for a test". It also allows for easy querying of image subranges, which is a nice bonus. * gfx: add RenderTarget::blitRgbaTo(framebuffer, rectangle). Generalizes blitRgbaToDefault(), which was a bit too limited. * [wip] more, now even a GUI * Revert everything that went into #1961 in order to merge it cleanly. Because there's a thing called clang-format which makes any clean merges just straight impossible. Yay! * Actually I do need to link. * sim: change how AbstractReplayRenderer classes get implemented. The public base class interface is now non-virtual, which allows it to perform various checks before delegating into the concrete implementation. Which allows the implementations to omit all checks that would otherwise be duplicated between them. * sim: change loadAndCreateRenderAssetInstance() back to return SceneNode*. * gfx/replay: use a virtual interface instead of heavy std::function. Also putting that back to a single file -- a Player can't really be used without the implementation class anyway so a separate header doesn't make sense. The light setup and semantic ID setting is optional, with the default implementation being a no-op. Also changed gfx::replay::GfxReplayNode* to gfx::replay::NodeHandle. It's shorter and the pointer is a part of the typedef, thus removing a potential ambiguity about whether one should use a * with this type or not. * clang! format! * replayer: further optimize keyframe loading. I felt physical pain when the string views had to be turned into a std::string, and then with a strlen() applied on it again. It's megabytes of data we're dealing with here! * sim: add composite file preloading API to ReplayBatchRenderer. It's a no-op by default (and for the classic renderer), but it's an important piece of functionality for the batch renderer. * replayer: make it possible to pause the simulation. * sim: cleanup. Haha silly me, inherited the batch player implementation from the scenegraph one, so when I removed the dummy virtual overrides it attempted to interpret the node handles as SceneNode* and caught fire. * sim: don't clear in the ReplayRenderer implementation. Doing it in the replayer instead, which allows me to exclude it from CPU profiling and lets me see the actual CPU overhead coming from the implementation, not waits for a next vsync. * gfx_batch: reset framebuffer viewport back to its original state after. * See, Clang Format, you made me not care for indentation anymore. * gfx/replay: add an API for deleting all instances. Even though deleting one by one wasn't really implemented yet for the batch renderer, it'd be extremely inefficient in any data-oriented implementation. This is a better approach, and is implemented there already. * gfx_batch,replayer: tiny fixes for SERIOUS bugs. * Clang Format is so advanced that puny humans can't guess what is The One and Only Correct Way To Format The Code. * Fix some valid Clang Tidy complaints. * Suppress / work around the remaining -- insane -- Clang Tidy suggestions. * C++17 was a mistake, as I always said. * Don't build the replayer utility on Emscripten. I don't see any practical use for it there. * Fix a TODO related to crash on exit. * Clean up, clarify TODOs, revert useless changes. * replayer: repeat the replays by default. Pass --once to the app to repeat just once. Useful for benchmarking the renderer without the JSON parsing overhead, which is apparently significantly higher than all operations the renderer needs to do :D * Let the machine make the code soulless again. * Forgot to add the actual Clang Tidy suppression. Because *imagine* how it would be if we could put comments next to the actual option we're adding. IMAGINE. * Make the Emscripten build compile at least. Not sure how important is to have this particular thing working there, so it's just an unreachable assert. * Give up and use a shared_ptr for PlayerImplementation. It was crashing because the python bindings for ReplayManager::readKeyframesFromFile() returned a Player but didn't tell Python the Player depends on the PlayerImplementation stored inside the ReplayManager. Which would involve some additional bookkeeping in the bindings, and ... everything else is using a shared_ptr anyway, so trying to avoid the unnecessary overhead in just a single place of all is like a drop in the ocean. Doesn't crash anymore with this change. * Forgot to link KtxImporter to the replayer class. * replayer: add some actual help text. * Rename ReplayRenderer to ClassicReplayRenderer for clarity. * sim: split up *ReplayRenderer classes into dedicated files. * Just don't use the Clang Tidy option at all, instead of enable + disable. The comment stays there though, for historical records. * Bad habits, sorry. Co-authored-by: Vladimír Vondruš <mosra@centrum.cz>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Contains various minor updates and fixes that don't depend on changes from #1947, thus hopefully possible to be reviewed & merged in isolation:
CameraSensorto a utility function on theCameraSensorSpecso I can use it even in scenegraph-less contexts. I felt like redoing all that calculation from scratch on my side would be too error prone, so I did it like this, and simplified the code slightly in the process. I hope it doesn't conflict with the upcoming/ongoing sensor refactor. The new API entrypoint isn't used anywhere at the moment, but it'll be in theReplayBatchRendererthat depends on Decouple gfx-replay player from scene graph; integrate the batch renderer into it #1947.gfx::RenderTarget::blitRgbaTo()which is likeblitRgbaToDefault()but with an ability to choose an arbitrary rectangle of an arbitrary framebuffer, which I need for feature parity in the batch renderer replay GUI. TheblitRgbaToDefault()is now built on top of this new API.How Has This Been Tested
The first two parts have a corresponding update in
GfxBatchRendererTest.The projection matrix is I assume tested somewhere already. I tried to exactly match the original behavior, including taking the
hfovoverride fromCameraSensorinstead ofCameraSensorSpec, please let me know if something feels off.