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.

Sign up for GitHub

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

Jump to bottom

Improvements to prefiltered environment maps #1420

Merged
merged 69 commits into from
Dec 29, 2023
Merged

Improvements to prefiltered environment maps #1420

merged 69 commits into from
Dec 29, 2023

Commits on Sep 18, 2023

  1. Update .gitignore with MaterialXView's CMake-generated files

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    3996bf5 View commit details
    Browse the repository at this point in the history

  2. Update .gitignore with compilation artifacts

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    dd47637 View commit details
    Browse the repository at this point in the history

  3. Add some XCode files to the .gitignore

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    3013728 View commit details
    Browse the repository at this point in the history

  4. Extend the image class to allow uploading custom mipmaps

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    266385c View commit details
    Browse the repository at this point in the history

  5. Implemented GPU rendering to the different mips

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8ae3d94 View commit details
    Browse the repository at this point in the history

  6. Add an environment pre-convolution shader

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    76d314d View commit details
    Browse the repository at this point in the history

  7. Implement per-mip logic for the convolution shader

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    fb312d3 View commit details
    Browse the repository at this point in the history

  8. Inverse equirectangular lookup

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    fb55bd1 View commit details
    Browse the repository at this point in the history

  9. WIP convolution shader

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    687da38 View commit details
    Browse the repository at this point in the history

  10. Finish the convolution shader

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    c6493bf View commit details
    Browse the repository at this point in the history

  11. Increase sample count

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    fa7d436 View commit details
    Browse the repository at this point in the history

  12. Fix the broken FIS sampling, since it relies on the environment map b… 

    …eing non-pre-convolved.
    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    fb08a15 View commit details
    Browse the repository at this point in the history

  13. Change convolved env texture format from RGBA8Unorm to RGB16Float

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    96f2520 View commit details
    Browse the repository at this point in the history

  14. Fix GLSL broadcasting error

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    ee5090b View commit details
    Browse the repository at this point in the history

  15. WIP implement OpenGL path

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5b793a1 View commit details
    Browse the repository at this point in the history

  16. Removed some unused code

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    afc608e View commit details
    Browse the repository at this point in the history

  17. Undo the addition of a "useCustomMipMaps" bool on Images 

    Remove function call in OpenGL
    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    55d9822 View commit details
    Browse the repository at this point in the history

  18. Bind uniforms to the opengl impl

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9d7dedc View commit details
    Browse the repository at this point in the history

  19. Fix OpenGL uniform upload

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    1cc0004 View commit details
    Browse the repository at this point in the history

  20. Delete temp code

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    26bbc3d View commit details
    Browse the repository at this point in the history

  21. Add back direct lighting UI

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5cd4526 View commit details
    Browse the repository at this point in the history

  22. Implement lazy-generation of the environment preconvolution

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    aaeb75c View commit details
    Browse the repository at this point in the history

  23. Call the lazy convolver in the OpenGL path

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    dd307fe View commit details
    Browse the repository at this point in the history

  24. Hoist metal shader generation outside the mip loop

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    4ad2868 View commit details
    Browse the repository at this point in the history

  25. Undo changes to gitignore

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    9b66cae View commit details
    Browse the repository at this point in the history

  26. Clean up OpenGL code

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    87d9bdb View commit details
    Browse the repository at this point in the history

  27. Remove unused comment

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    6ff67a9 View commit details
    Browse the repository at this point in the history

  28. Revert unncessary change

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    e57f920 View commit details
    Browse the repository at this point in the history

  29. Revert unused change in header file

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    23d1871 View commit details
    Browse the repository at this point in the history

  30. Remove custom GGX function in favor of built-in one

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5439181 View commit details
    Browse the repository at this point in the history

  31. Lazy-init convolution on OpenGL, and don't rebuild the map afterwards

    @ApoorvaJ
    ApoorvaJ committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    14ab9e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Reorder constructor initialization to get rid of warnings

    @ApoorvaJ
    ApoorvaJ committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    d40e456 View commit details
    Browse the repository at this point in the history

  2. Add a separate param for whether a texture is used as a render target

    @ApoorvaJ
    ApoorvaJ committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e71ea99 View commit details
    Browse the repository at this point in the history

  3. Attempt to fix the VSCode warning 'unreferenced formal parameter'

    @ApoorvaJ
    ApoorvaJ committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e006bb0 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Merge branch 'main' into fix-split-sum-ibl

    @jstone-lucasfilm
    jstone-lucasfilm authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    7e8bd86 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. Merge branch 'main' into fix-split-sum-ibl

    @jstone-lucasfilm
    jstone-lucasfilm authored Dec 16, 2023
    Configuration menu
    Copy the full SHA
    e9bf596 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2023

  1. Merge branch 'main' into fix-split-sum-ibl

    @jstone-lucasfilm
    jstone-lucasfilm authored Dec 23, 2023
    Configuration menu
    Copy the full SHA
    bfd659d View commit details
    Browse the repository at this point in the history

  2. Restore original mx_environment_radiance 

    This changelist restores the original implementation of mx_environment_radiance in the prefiltered path, as there does not appear to be any visual difference when switching between the original and new implementations.
    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    6de22f3 View commit details
    Browse the repository at this point in the history

  3. Minor naming update

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    31c606d View commit details
    Browse the repository at this point in the history

  4. Minor formatting updates

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    12ef1d8 View commit details
    Browse the repository at this point in the history

  5. Minor naming updates

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    86c89ce View commit details
    Browse the repository at this point in the history

  6. Additional naming updates

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    5735998 View commit details
    Browse the repository at this point in the history

  7. Harmonize on prefilter over preconvolve 

    This changelist harmonizes on the word "prefilter" over "preconvolve", aligning with existing terminology in the MaterialX codebase.
    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    983d05f View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. Additional terminology updates

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    f0e5eef View commit details
    Browse the repository at this point in the history

  2. Add virtual method

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    41b7d07 View commit details
    Browse the repository at this point in the history

  3. Clarify shader variable names

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    e5738d0 View commit details
    Browse the repository at this point in the history

  4. Harmonize GGX importance sampling

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    7ff97b0 View commit details
    Browse the repository at this point in the history

  5. Simplify shader math

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    207b4eb View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Clarify shader math

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    3f3f7aa View commit details
    Browse the repository at this point in the history

  2. Harmonize on VNDF sampling

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    8b74333 View commit details
    Browse the repository at this point in the history

  3. Standardize shader math

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    9613f48 View commit details
    Browse the repository at this point in the history

  4. Update orthonormal basis logic

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    eacae2e View commit details
    Browse the repository at this point in the history

  5. Use filtered environment samples

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    31f35e7 View commit details
    Browse the repository at this point in the history

  6. Refine documentation for new functions

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0711edd View commit details
    Browse the repository at this point in the history

  7. Minor clarifications

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    2ac301c View commit details
    Browse the repository at this point in the history

  8. Reduce sample count 

    This changelist reduces the environment sample count from 1024 to 256, taking advantage of the recently-added filtering.
    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    7ece761 View commit details
    Browse the repository at this point in the history

  9. Update documentation

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    ac4a526 View commit details
    Browse the repository at this point in the history

  10. Clarify function names

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    0763963 View commit details
    Browse the repository at this point in the history

  11. Update documentation

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    1bfd917 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Minor shader reorganization

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1348ece View commit details
    Browse the repository at this point in the history

  2. Fix off-by-one error

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    0dd8059 View commit details
    Browse the repository at this point in the history

  3. Add default arguments

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    f2b0e37 View commit details
    Browse the repository at this point in the history

  4. Remove unused initializer

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    cf9e332 View commit details
    Browse the repository at this point in the history

  5. Restore original getMaxMipCount

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    00c47a6 View commit details
    Browse the repository at this point in the history

  6. Increase sample count for accuracy

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    d82c08b View commit details
    Browse the repository at this point in the history

  7. Fix warning message

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    ab08644 View commit details
    Browse the repository at this point in the history

  8. Clarify comment

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    6c77f06 View commit details
    Browse the repository at this point in the history

  9. Remove extra newline

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    2b8605f View commit details
    Browse the repository at this point in the history

  10. Add missing initializer

    @jstone-lucasfilm
    jstone-lucasfilm committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    5145328 View commit details
    Browse the repository at this point in the history