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

Port ign-rendering to Ogre 2.3 #553

Merged
merged 26 commits into from
Jul 29, 2022
Merged

Port ign-rendering to Ogre 2.3 #553

merged 26 commits into from
Jul 29, 2022

Commits on Jul 23, 2022

  1. Upgrade to Ogre 2.3 

    Signed-off-by: Matias N. Goldberg <[email protected]>

ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    785c24a View commit details
    Browse the repository at this point in the history

  2. Port Terra shaders to 2.3 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    e9286ba View commit details
    Browse the repository at this point in the history

  3. Fix some failing tests due to 2.3 changes 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    44b27bb View commit details
    Browse the repository at this point in the history

  4. Use depth clamp override via Ogre2 

    Ogre 2.3 added _setNeedsDepthClamp
Furthermore glEnable(GL_DEPTH_CLAMP); was no longer working as Ogre
would override that setting.

All tests are now passing again

Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    c4edd48 View commit details
    Browse the repository at this point in the history

  5. Remove GLSLES paths 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    6c15bdf View commit details
    Browse the repository at this point in the history

  6. Port shaders to Vulkan 

    Add BRDF LUT data files for LTC Area lights (currently unused)

Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    b1353d0 View commit details
    Browse the repository at this point in the history

  7. Lots of Vulkan shader fixes 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    25fdf42 View commit details
    Browse the repository at this point in the history

  8. Ogre2GpuRays no longer creates the compositor programmatically 

    It uses a script now.
Textures are passed via the Compositor or else Ogre cannot setup proper
layout transitions for Vulkan for these textures
Fix INTEGRATION_gpu_rays under Vulkan

Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    ecfd21d View commit details
    Browse the repository at this point in the history

  9. Reduce VRAM consumption by reusing textures in Ogre2GpuRays 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    0999d90 View commit details
    Browse the repository at this point in the history

  10. Fix INTEGRATION_camera under Vulkan 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    ea5e601 View commit details
    Browse the repository at this point in the history

  11. Fix codecheck errors 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    c87b3d6 View commit details
    Browse the repository at this point in the history

  12. Add -vulkan toggle 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    35912f2 View commit details
    Browse the repository at this point in the history

  13. Handle format conversions in Ogre2RenderTarget::Copy 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    ea383da View commit details
    Browse the repository at this point in the history

  14. Fix heightmap errors 

    Add missing listener redirections

Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    7474861 View commit details
    Browse the repository at this point in the history

  15. Fix INTEGRATION_camera crash 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    8df13e1 View commit details
    Browse the repository at this point in the history

  16. Add Syntax changes based on feedback 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    c5e7a4f View commit details
    Browse the repository at this point in the history

  17. Fix formatting issues 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    bc9be0e View commit details
    Browse the repository at this point in the history

  18. Fix waves sample under Vulkan 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    e6737a3 View commit details
    Browse the repository at this point in the history

  19. Fix build error with Ogre 2.3.1 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    589032c View commit details
    Browse the repository at this point in the history

  20. Request for OGRE-Next 2.3.1 in CMake 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    3c7db54 View commit details
    Browse the repository at this point in the history

  21. Fix macOS / Metal crash 

    plaincolor_fs_Metal depends on plaincolor_vs_Metal which causes a crash
with OgreNext 2.3.1

Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    775c423 View commit details
    Browse the repository at this point in the history

  22. Fix bad rebase 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    983638b View commit details
    Browse the repository at this point in the history

  23. Fix failing tests due to ign -> gz rename 

    Signed-off-by: Matias N. Goldberg <[email protected]>
    @darksylinc
    darksylinc committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    72b59de View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Update dependencies and add to RPath for debs 

    Signed-off-by: Michael Carroll <[email protected]>
    @mjcarroll
    mjcarroll committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    3beb99c View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Refactor rendering tests to run against multiple implementations (gaz… 

    …ebosim#685)

As we have increased our number of potential configurations, we needed a bit of a refactor to be able to test all of the configurations.

This changes the tests to no longer use gtest's parameterization, but rather use ctest's

Signed-off-by: Michael Carroll <[email protected]>
    @mjcarroll
    mjcarroll committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    aa78da6 View commit details
    Browse the repository at this point in the history

  2. Port remaining tests to common framework (gazebosim#694) 

    * Port remaining tests to common framework

Signed-off-by: Michael Carroll <[email protected]>
    @mjcarroll
    mjcarroll committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    37da046 View commit details
    Browse the repository at this point in the history