Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mobile NeRF general fixes #1092

Conversation

RodrigoHolztrattner-QuIC
Copy link
Collaborator

@RodrigoHolztrattner-QuIC RodrigoHolztrattner-QuIC commented Jul 8, 2024

Description

  • Fix combo mode not properly using the right MLP weights.
  • Fix 'image_layout_transition()' at 'setup_attachment()' throwing an error when using VK_IMAGE_LAYOUT_GENERAL.
  • Initialize VkAttachmentDescriptions to fix validation issues.
  • Use vkb::sg::Image::Other instead of vkb::sg::Image::Color so textures are properly loaded as linear color space instead sRGB.
  • Other clean up and modification:
    1. Remove weights_buffer_ref & uniform_buffer_ref, which are raw ptrs pointing to unique ptrs in vectors. This is unsafe, as everything will mess up when vector gets reallocated. Use indices as references instead.
    2. No need to update weights buffers for every frame, only upon their creation.
    3. No need to have samplers for G-buffer attachments because we directly use subpass load, removed.
    4. No need for mlp.comp shader, removed.
    5. No need for aligned_size() function, removed.
    6. No need to include "stb_image.h" in mobile_nerf.cpp.
    7. Remove debug code in shaders.

General Checklist:

Please ensure the following points are checked:

  • My code follows the coding style
  • I have reviewed file licenses
  • I have commented any added functions (in line with Doxygen)
  • I have commented any code that could be hard to understand
  • My changes do not add any new compiler warnings
  • My changes do not add any new validation layer errors or warnings
  • I have used existing framework/helper functions where possible
  • My changes do not add any regressions
  • I have tested every sample to ensure everything runs correctly
  • This PR describes the scope and expected impact of the changes I am making

Note: The Samples CI runs a number of checks including:

  • I have updated the header Copyright to reflect the current year (CI build will fail if Copyright is out of date)
  • My changes build on Windows, Linux, macOS and Android. Otherwise I have documented any exceptions

If this PR contains framework changes:

  • I did a full batch run using the batch command line argument to make sure all samples still work properly

Sample Checklist

If your PR contains a new or modified sample, these further checks must be carried out in addition to the General Checklist:

  • I have tested the sample on at least one compliant Vulkan implementation
  • If the sample is vendor-specific, I have tagged it appropriately
  • I have stated on what implementation the sample has been tested so that others can test on different implementations and platforms
  • Any dependent assets have been merged and published in downstream modules
  • For new samples, I have added a paragraph with a summary to the appropriate chapter in the readme of the folder that the sample belongs to e.g. api samples readme
  • For new samples, I have added a tutorial README.md file to guide users through what they need to know to implement code using this feature. For example, see conditional_rendering
  • For new samples, I have added a link to the Antora navigation so that the sample will be listed at the Vulkan documentation site

@RodrigoHolztrattner-QuIC RodrigoHolztrattner-QuIC marked this pull request as ready for review July 8, 2024 20:47
samples/general/mobile_nerf/mobile_nerf.cpp Outdated Show resolved Hide resolved
samples/general/mobile_nerf/mobile_nerf.cpp Outdated Show resolved Hide resolved
samples/general/mobile_nerf/mobile_nerf.cpp Outdated Show resolved Hide resolved
shaders/mobile_nerf/mlp_combo.frag Outdated Show resolved Hide resolved
shaders/mobile_nerf/mlp_combo.frag Outdated Show resolved Hide resolved
Signed-off-by: Rodrigo Holztrattner <quic_rholztra@quicinc.com>
Signed-off-by: Rodrigo Holztrattner <quic_rholztra@quicinc.com>
@SaschaWillems SaschaWillems self-requested a review July 11, 2024 15:36
Copy link
Collaborator

@SaschaWillems SaschaWillems left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes look fine to me. Works on my RTX 4070 on WIn11.

@marty-johnson59 marty-johnson59 merged commit 4edd653 into KhronosGroup:main Jul 15, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants