summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-17Fix crash during avatar profile callback (#218)Rye Mutt
2023-05-17Increment viewer version to 6.6.13Nat Goodspeed
following promotion of DRTVWR-577
2023-05-16DRTVWR-559 Decruft deprecated OpenGL flags.RunitaiLinden
2023-05-15SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it ↵RunitaiLinden
clear that those buttons are inoperable until you remove the PBR material.
2023-05-15SL-19709 Fix for fullbright shiny not factoring out exposure and flickering ↵RunitaiLinden
fullbright alpha. Incidental decruft.
2023-05-12SL-19710 Fix for deadlock in LLPerfStats. Move General thread ↵RunitaiLinden
initialization to earlier in session (unrelated).
2023-05-11Xcode build fixes for DRTVWR-559Brad Linden
2023-05-11Merge pull request #212 from secondlife/SL-19236cosmic-linden
SL-19236: Fix HUDs not rendering when transparent water graphics setting is off
2023-05-11SL-19236: Fix HUDs not rendering when transparent water graphics setting is offCosmic Linden
2023-05-11SL-19656 Remove LLPerfStats thread and fold into General thread. Hook ↵RunitaiLinden
avatar GPU time into LLPerfStats. Incidental decruft.
2023-05-08Merge pull request #206 from secondlife/SL-19644cosmic-linden
SL-19644: De-virtualize pushBatch
2023-05-05SL-19644: De-virtualize pushBatchCosmic Linden
Bump still uses its own pushBumpBatch function - OK, works the same as before.
2023-05-04SL-18932 Canceling material selection only reverts overrideAndrey Kleshchev
2023-05-04Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559Brad Linden
2023-05-04DRTVWR-559: Add <unordered_map> header since we use it.Nat Goodspeed
2023-05-04Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-05-04DRTVWR-559: Merge 'DRTVWR-559' into DRTVWR-559-zapfuncNat Goodspeed
2023-05-03Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559RunitaiLinden
2023-05-03DRTVWR-559 WIP - optimize ARC calculation et al.RunitaiLinden
2023-05-03SL-19647: Eliminate LLSDArray entirely.Nat Goodspeed
Newer C++ compilers have different semantics around LLSDArray's special copy constructor, which was essential to proper LLSD nesting. In short, we can no longer trust LLSDArray to behave correctly. Now that we have variadic functions, get rid of LLSDArray and replace every reference with llsd::array().
2023-05-03Merge pull request #191 from ↵Brad Linden
secondlife/brad/SL-19648-refcount-llgltfmaterial-thread-safety Fix SL-19675 crash due to thread unsafe LLRefCount usage possibly related to SL-19648
2023-05-03Cleanup with SL-19675 fix. lifted empty check outside the workqueue post ↵Brad Linden
and cleaned up indentation
2023-05-03Improved fix for SL-19675 crash. How about just don't refer to data when ↵Brad Linden
you don't need it
2023-05-03DRTVWR-575: Replace some LLSDArray() usage with llsd::array().Nat Goodspeed
It seems newer compilers have a different interpretation of exactly when to engage LLSDArray's copy constructor. In particular, this assignment: some_LLSD_map[key] = LLSDArray(...)(...)...; used to convert the LLSDArray object directly to LLSD; now it first calls the custom copy constructor, which embeds the intended array within an outer array before assigning it into the containing map. The newer llsd::array() function avoids that problem because what it returns is already an LLSD object. Taking inventory of LLSDArray assignments of that form turned up a number of workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is both simpler and more readable. Tip of the hat to Chorazinallen for surfacing this issue! (cherry picked from commit bb718155bddfbe7007029a0c9e69a4a98615f14d)
2023-05-03DRTVWR-559: Merge remote branch 'DRTVWR-559' into DRTVWR-559-zapfuncNat Goodspeed
Delete the debugLoggingEnabled() (changed to LL_DEBUGS()) stanzas deleted by the upstream.
2023-05-03DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().Nat Goodspeed
The trouble with debugLoggingEnabled() is that it locked mutexes and searched maps every time that call was reached. LL_DEBUGS() has the same functionality (albeit with idiosyncratic syntax) but performs expensive lookups only once per session, caching the result in a local static variable.
2023-05-02DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU ↵RunitaiLinden
timer without a frame stall.
2023-05-02Attempt at fixing thread safety possibly related to SL-19648Brad Linden
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-05-02Increment viewer version to 6.6.12Vir Linden
following promotion of DRTVWR-539
2023-05-01SL-19656 followup removing unused variableBrad Linden
2023-05-01SL-19656 Rewrite avatar and attachment render metrics to not interfere with ↵RunitaiLinden
render pipe and be representative of actual render cost instead of driver synchronization time. * SL-19656 Rewrite avatar and attachment render metrics to not interfere with render pipe and be representative of actual render cost instead of driver synchronization time. * SL-19656 Remove now dead code (trackAttachments et al). * SL-19656 Fix for crash on GL <= 3.2
2023-04-28Merge pull request #196 from secondlife/SL-19644cosmic-linden
SL-19644: Move GLTF transform reset out of pushBatch
2023-04-28DRTVWR-559 Touch up performance floater graphics preferences to remove ↵RunitaiLinden
preferences that no longer exist.
2023-04-28SL-19644: Entirely separate files for GLTF alpha shadowsCosmic Linden
2023-04-28SL-19644: Bind the shader on every shadow alpha blend callCosmic Linden
2023-04-28SL-19644: Move GLTF transform reset out of pushBatchCosmic Linden
2023-04-28Merge pull request #198 from secondlife/DRTVWR-559-merge-539Brad Linden
DRTVWR-559 merge 539
2023-04-28Fix for mac shader loading failure freeze at startup SL-19668Brad Linden
2023-04-27Readded RenderClass1MemoryBandwidth setting after DRTVWR-559 & DRTVWR-539 mergeBrad Linden
Has to use class1 now since class0 shouldn't ever be in use on end-user systems anymore.
2023-04-27More merge cleanup after DRTVWR-559 & DRTVWR-539 merge. (thanks Ansariel)Brad Linden
2023-04-27DRTVWR-559 Fix for crash on GL 3.RunitaiLinden
2023-04-27More post-merge fixes after DRTVWR-559 & DRTVWR-539 mergeBrad Linden
2023-04-27Merge pull request #195 from secondlife/SL-19653cosmic-linden
SL-19653: Fix some vertex buffer data mask asserts
2023-04-26DRTVWR-559 Add "No Post" mode and refactor "Scene Gamma" into "Brightness" ↵RunitaiLinden
for adjusting legacy gamma when probe ambiance is 0 and dynamic exposure when probe ambiance is not zero.
2023-04-26Got things to compile again after DRTVWR-559 & DRTVWR-539 merge.Brad Linden
removing dead code and references to members that don't exist anymore
2023-04-26SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 mergeBrad Linden
2023-04-26SL-19653: Fix data mask assert: specular-normal blinn-phong in wrong binCosmic Linden
2023-04-26SL-19653: Fix assert: Prims were added to glow draw pool when glow was at or ↵Cosmic Linden
near zero