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

develop → Maint C sync #3178

Merged
merged 35 commits into from
Nov 28, 2024
Merged

develop → Maint C sync #3178

merged 35 commits into from
Nov 28, 2024

Commits on Nov 6, 2024

  1. #2768: Partial fix for PBR texture animations stopping. May also fix …

    …some Blinn-Phong texture animations. (#2971)
    cosmic-linden committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    5d62cdb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff856af View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. brad/2744 handle shader errors (#3105)

    * Partial solution to #2744 crash with better error handling.
    
    Handles shader compile errors better, and should turn crash into an LL_ERRS assertion failure.
    Strengthed more assertions and improved shader error line numbers
    
    * Even more error handling to get a handle on crash #2744
    * Improved GLSL correctness on Intel chips that lack OpenGL 4.6 support. #2744
    * Removed non-working fallback code for gDeferredPostProgram
    * Fixed incorrect llmax call
    brad-linden authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    7be9c43 View commit details
    Browse the repository at this point in the history
  2. Crash at getDiscardLevel()

    akleshchev committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    8d52d06 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6c6b388 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. Configuration menu
    Copy the full SHA
    3db8ce9 View commit details
    Browse the repository at this point in the history
  2. viewer#3125 Crash at LLMaterialEditor::loadMaterial

    Looks like floater expired while waiting for response
    akleshchev committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7ff7de0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    934833b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9cb6203 View commit details
    Browse the repository at this point in the history
  5. #3104: Remove resolution restriction but prevent texture from fully l…

    …oading. Miscellaneous cleanup and comments.
    cosmic-linden committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    e7a7eed View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    97f0a21 View commit details
    Browse the repository at this point in the history
  7. viewer#3133 Callback related crash in LLViewerFetchedTexture

    Seems to be realted to LLModelPreview and path generated textures so I'm
    improving cleanup.
    akleshchev committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    bedf884 View commit details
    Browse the repository at this point in the history
  8. viewer#3055 Fix texture fetch being stuck

    destroyRawImage is the only function that calls saveRawImage(), not
    calling it results in fetcher thinking that it still needs data to do
    the saving and looping back to trying to fetch.
    akleshchev committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    2d82fa2 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #3137 from secondlife/v-3104_extrafps

    #3104: Fix outfit gallery pictures sometimes not loading. Remove texture resolution restriction.
    cosmic-linden authored Nov 22, 2024
    Configuration menu
    Copy the full SHA
    3d33326 View commit details
    Browse the repository at this point in the history
  10. Minor cleanups and logging/ViewerStats improvements for GL3 fallback …

    …trigger for intel HD 4X00 gpus
    brad-linden committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    86b7cfe View commit details
    Browse the repository at this point in the history
  11. Convenience deployment tooling for cross-developing on "Classic Mode"…

    … machines
    
    i.e. hardware that has a hard time running visual studio and tracy.
    
    for example, use it by running `autobuild configure -- -DLOCAL_DIST_DIR=dist/secondlife`
    and then export that directory under your build tree as a shared folder.
    brad-linden committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    9a29f07 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2024

  1. Merge pull request #3141 from secondlife/brad/2744-cleanups

    #2744 intel fallback cleanups
    brad-linden authored Nov 23, 2024
    Configuration menu
    Copy the full SHA
    b7924f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2024

  1. Configuration menu
    Copy the full SHA
    9f86209 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    feb6b39 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. Merge pull request #3143 from secondlife/v-2768_extrafps

    #2768, #2848: Partial cherry pick of "Animated pbr textures don't animate" from develop
    brad-linden authored Nov 26, 2024
    Configuration menu
    Copy the full SHA
    7ef6e8f View commit details
    Browse the repository at this point in the history
  2. Drop emissive on old Intel GPUs (#3110)

    * #3103 Add the ability to disable the emissive buffer for older GPUs with low memory bandwidth.
    * #3135 Add a "vintage" mode for slower GPUs
    * #2719 Fix for skies being overbrightened
    * #2632 Do not apply tonemapping on legacy skies
    Geenz authored Nov 26, 2024
    Configuration menu
    Copy the full SHA
    d65fb7c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    77b715c View commit details
    Browse the repository at this point in the history
  4. #2696 Viewer crashes on gestures : fix the bug (#3152)

    Co-authored-by: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
    brad-linden and LLGuru authored Nov 26, 2024
    Configuration menu
    Copy the full SHA
    ca5119d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3d9ee40 View commit details
    Browse the repository at this point in the history
  6. viewer#3147 Thumbnail picker's image is grey

    when both thumnail and normal image attempt to fetch, one creates a
    fetcher, another fails, since fetcher is already there, potentially in a
    transitional state, so it thinks fetch failed.
    akleshchev committed Nov 26, 2024
    4 Configuration menu
    Copy the full SHA
    38845a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2024

  1. #3157 Fix alpha not having ambient lighting on low. (#3162)

    * #3157 Fix alpha not having ambient lighting on low.
    Geenz authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    a90377d View commit details
    Browse the repository at this point in the history
  2. viewer#3147 Thumbnail picker's image is grey #2

    Apparently made a blunder in previous commit since I missed mFetchState
    being reset each run
    akleshchev committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    79fe883 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fd0389c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a13ae88 View commit details
    Browse the repository at this point in the history
  5. Make sure CAS controls are not active with vintage mode. (#3176)

    Also make extra sure vintage mode is enabled when GL3 is detected.
    Geenz authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    6128a7d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9321f8e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #3173 from secondlife/nat/ftfix

    Add diagnostic output for LLProcess event history failure.
    brad-linden authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    16cc5fc View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'origin/release/2024.09-ExtraFPS' into d…

    …evelop
    
     # Conflicts:
     #	indra/newview/featuretable.txt
     #	indra/newview/llfeaturemanager.cpp
     #	indra/newview/llviewerdisplay.cpp
     #	indra/newview/llviewershadermgr.cpp
     #	indra/newview/llvovolume.cpp
     #	indra/newview/pipeline.cpp
    brad-linden committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    3a4a112 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2024

  1. Merge pull request #3177 from secondlife/brad/develop-merge

    ExtraFPS -> develop merge
    brad-linden authored Nov 28, 2024
    Configuration menu
    Copy the full SHA
    0cb91ee View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into marchcat/c-develop

    # Conflicts:
    #	indra/newview/llmaterialeditor.cpp
    marchcat committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    687f6d9 View commit details
    Browse the repository at this point in the history