summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-22Merge branch 'release/materials_featurette' of github.com:secondlife/viewer ↵Cosmic Linden
into DRTVWR-592
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2024-01-19SL-20606: Remove unused strider gettersCosmic Linden
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2024-01-18Allow for upload of 2k textures (#652)RunitaiLinden
* SL-20760 Allow 2k texture uploads * SL-20760 Fix for textures not downloading.
2024-01-17SL-20795 Part of previously typed emojis disappear in the 'Save settings as ↵Alexander Gavriliuk
a preset...' option of the 'Preferences' floater
2024-01-11Rename OS X to macOS, mostly in commentsLars Næsbye Christensen
We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.
2024-01-10SL-20704 Fix for pathfinding debug display not working.RunitaiLinden
2024-01-08Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/llmaterialeditor.cpp
2024-01-08Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
# Conflicts: # indra/newview/llmaterialeditor.cpp
2024-01-08Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-01-08Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-XAndrey Kleshchev
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2024-01-04SL-17896 Don't crash silently if files are missing or out of memoryAndrey Kleshchev
Under debug LL_ERRS will show a message as well, but release won't show anything and will quit silently so show a notification when applicable.
2023-12-21SL-20743 Use LLMutex in LLImageBase for internal data thread-safetyAlexander Gavriliuk
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-14Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/newview/llspatialpartition.cpp
2023-12-13SL-20279 BugSplat Crash #1327171: gl_debug_callback(111)Alexander Gavriliuk
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-596' into davep/SL-20611RunitaiLinden
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-21SL-20411 Thumbnail textures should have less of an impact on performance #1Andrey Kleshchev
scale thumbnail textures down to 256 when needed. As we do to chat icons. # Conflicts: # indra/newview/llviewertexture.cpp
2023-11-17SL-20611 followup -- remove now unused glsl files. Fix transparent water.RunitaiLinden
2023-11-16SL-20611 Make haze effect local lights -- move sky and water haze to their ↵RunitaiLinden
own passes and unify sky and water haze in forward rendering shaders.
2023-10-25Fix DRTVWR-559 std::array usage in llrender and llprimitive after mergeBrad Linden
2023-10-23SL-20498 Preserve default probe when resetting reflection probes.RunitaiLinden
2023-10-16Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-10-16Tons of masking changes and tweaks.Jonathan "Geenz" Goodman
We now support masking mirrors in the GBuffer. We also now support the concept of one arbitrary clip plane. DRTVWR-583
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: (WIP) Triplanar mappingCosmic Linden
2023-10-13DRTVWR-592: (WIP) (does not run) PBR terrain rendering - more work on ↵Cosmic Linden
shaders, uniforms
2023-10-13DRTVWR-592: (WIP) (does not run) PBR terrain rendering - begin work on ↵Cosmic Linden
shaders, uniforms
2023-10-09SL-20411 Thumbnail textures should have less of an impact on performance #1Andrey Kleshchev
scale thumbnail textures down to 256 when needed. As we do to chat icons.
2023-10-08Merge branch main into DRTVWR-489Alexander Gavriliuk
2023-10-03Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventorybridge.cpp # indra/newview/lltexturectrl.h # indra/newview/llvovolume.cpp
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03:xAlexander Gavriliuk
2023-09-29Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-28Fix integer overflow when framebuffers are extremely high resolution ↵Rye Mutt
resulting in INT_MAX texture bias (#393)
2023-09-25Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-20SL-20280 BugSplat Crash in LLVertexBuffer::setBuffer()Alexander Gavriliuk
2023-09-15SL-20279 BugSplat Crash #1327171: gl_debug_callback(111)Alexander Gavriliuk
2023-09-11Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842RunitaiLinden
2023-09-09Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-05SL-19709 Fix for fullbright shiny not factoring out exposure (update)Alexander Gavriliuk
2023-08-29Add a probe strength uniform for hero probes.Jonathan "Geenz" Goodman
On standard reflection probes this doesn't really do anything. DRTVWR-583
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-22SL-19842 WIP -- Move sky auto adjustment magic numbers to debug settings.RunitaiLinden
2023-07-31Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-18Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)Brad Linden