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

Conversation

marchcat
Copy link
Contributor

Following #3177.

cosmic-linden and others added 30 commits November 5, 2024 17:08
* 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
Looks like floater expired while waiting for response
Seems to be realted to LLModelPreview and path generated textures so I'm
improving cleanup.
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.
#3104: Fix outfit gallery pictures sometimes not loading. Remove texture resolution restriction.
… 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.
#2768, #2848: Partial cherry pick of "Animated pbr textures don't animate" from develop
* #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
Co-authored-by: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
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.
* #3157 Fix alpha not having ambient lighting on low.
Apparently made a blunder in previous commit since I missed mFetchState
being reset each run
Also make extra sure vintage mode is enabled when GL3 is detected.
akleshchev and others added 5 commits November 28, 2024 00:49
Add diagnostic output for LLProcess event history failure.
…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
# Conflicts:
#	indra/newview/llmaterialeditor.cpp
@marchcat marchcat merged commit c98b7c4 into release/maint-c Nov 28, 2024
14 checks passed
@marchcat marchcat deleted the marchcat/c-develop branch November 28, 2024 17:16
@github-actions github-actions bot locked and limited conversation to collaborators Nov 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants