Ansariel
|
b99cf9fb86
|
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
|
2025-09-05 14:55:37 +02:00 |
|
Rye
|
6fcd349f37
|
Fix Tracy memory profiling overloads for aligned allocations
Fix disabling renderdoc support
Improve ll_aligned_alloc functions on darwin for 32 and 64byte aligned by utilizing posix_memalign
|
2025-02-11 05:04:05 -05:00 |
|
Ansariel
|
ec8ead914d
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llxml/llxmlnode.cpp
# indra/newview/featuretable_linux.txt
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-10-31 19:42:30 +01:00 |
|
Andrey Kleshchev
|
200a196d31
|
viewer#2883 Regenerate font's matrix and depth instead of loading
to fix issues with nametags and window resizes
|
2024-10-28 16:47:19 +02:00 |
|
Ansariel
|
1cca913ba7
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodelloader.cpp
# indra/llrender/llgl.h
# indra/llrender/llrender.h
# indra/llui/llurlentry.cpp
# indra/llui/llurlentry.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvoavatar.cpp
|
2024-09-13 18:54:12 +02:00 |
|
Rye Mutt
|
b713f56d07
|
Replace glh_linear usage with GLM (#2554)
|
2024-09-12 11:22:10 -05:00 |
|
Ansariel
|
a592823ec6
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llvovolume.cpp
|
2024-09-11 12:06:41 +02:00 |
|
RunitaiLinden
|
cde5d29faf
|
Profile guided optimizations
|
2024-09-10 18:27:45 -05:00 |
|
Ansariel
|
a9b52b1f73
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llrender.cpp
# indra/llui/llbutton.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/llhudtext.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2024-09-04 11:17:13 +02:00 |
|
Andrey Kleshchev
|
5c64e5e13d
|
viewer#2411 LLFontGL::render optimizations #3
|
2024-09-04 10:16:46 +03:00 |
|
Ansariel
|
3be6763aa0
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/APR.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llface.h
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llvoavatar.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
|
2024-08-08 21:34:26 +02:00 |
|
Alexander Gavriliuk
|
17f7b439d6
|
#1922 Make PBR scale and offset crosshair work like Texture crosshair do
|
2024-08-08 13:40:23 +02:00 |
|
Ansariel
|
364a14a8aa
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofilercategories.h
|
2024-06-21 22:45:12 +02:00 |
|
Dave Parks
|
80ea30af1a
|
#1769 gltf optimization pass (#1816)
#1814 and #1517 Fix mirror update rate and occlusion culling
|
2024-06-21 13:13:08 -05:00 |
|
Ansariel
|
050d2fefab
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/gltf/primitive.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
|
2024-06-13 03:21:12 +02:00 |
|
Brad Linden
|
8444cd9562
|
Fix whitespace pre-commit hook failures
|
2024-06-12 13:51:21 -07:00 |
|
Dave Parks
|
f40fbdf4ad
|
#1718 Add GLTF support for multiple texcoords (#1720)
* Fix for GLTF MeshPrimitiveModes test
|
2024-06-11 17:10:13 -05:00 |
|
Ansariel
|
1bbe697db7
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
|
2024-06-11 14:38:20 +02:00 |
|
Dave Parks
|
227e9be068
|
#1654 generate normals and tangents according to gltf specification (#1662)
* Disable unloading of objects in background.
* Add unlit GLTF shader variant
|
2024-06-10 10:43:38 -05:00 |
|
Brad Linden
|
a1f49564d6
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
|
2024-05-23 11:31:19 -07:00 |
|
Ansariel
|
ea5ead6f4a
|
Merge remote-tracking branch 'FS600/master'
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-23 18:15:07 +02:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Ansariel
|
508ab2df1c
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-05-10 12:40:19 +02:00 |
|
RunitaiLinden
|
c6d752b880
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
|
2024-05-06 16:48:58 -05:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
f4250bcfaf
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llmanip.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.h
# indra/newview/pipeline.h
|
2024-04-24 22:05:15 +02:00 |
|
RunitaiLinden
|
cadc1a02cc
|
1285 GLTF Animation Prototype
|
2024-04-24 09:51:15 -05:00 |
|
Ansariel
|
163ea9a5b7
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llmath/xform.h
# indra/llprimitive/llmaterialtable.cpp
# indra/llprimitive/llprimitive.h
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llgltexture.cpp
# indra/llrender/llgltexture.h
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
|
2024-02-20 10:49:47 +01:00 |
|
Ansariel
|
b2c2713672
|
Convert BOOL to bool in llrender
|
2024-02-20 02:14:01 +02:00 |
|
Ansariel
|
4d2549969c
|
Merge branch 'DRTVWR-592' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_region_terrain.xml
|
2024-01-23 16:03:33 +01:00 |
|
Cosmic Linden
|
2f18d74f9a
|
SL-20606: Full GLTF material preview. Works for most materials.
|
2024-01-19 15:43:13 -08:00 |
|
Cosmic Linden
|
c2a30057f8
|
SL-20606: Remove unused strider getters
|
2024-01-19 15:43:12 -08:00 |
|
Ansariel
|
5323ccf3b3
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/llprofilercategories.h
# indra/llcommon/lluuid.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/llagent.cpp
# indra/newview/llface.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
|
2023-03-20 11:14:08 +01:00 |
|
Dave Parks
|
25ede86382
|
SL-19172 Texture streaming tune up. Incidental decruft.
|
2023-03-10 10:52:35 -06:00 |
|
Ansariel
|
b4fde14f09
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-01-19 23:04:50 +01:00 |
|
RunitaiLinden
|
7bd9d21e19
|
Optimizations, decruft, and intel compatibility pass (#53)
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
|
2023-01-19 09:13:45 -06:00 |
|
Ansariel
|
75180c8746
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
|
2023-01-12 12:08:46 +01:00 |
|
Dave Parks
|
68da705f3b
|
SL-18869 Optimizations -- Quiet command buffer -- VBO cache for UI et al and remove many unneeded VBO binds.
|
2023-01-10 18:42:09 -06:00 |
|
Dave Parks
|
fdc0ea64f0
|
SL-18869 Optimizations -- LLVertexBuffer overhaul and shuffle of shadow map rendering to a place where the main camera has taken a stab at object updates for this frame before shadow map rendering has at them.
|
2023-01-10 17:36:05 -06:00 |
|
Dave Parks
|
b3fc82ff1d
|
SL-18869 Optimizations -- decruftify LLVertexBuffer and make an optimal "renderShadowSimple" utility function for pushing vertex buffers only.
|
2023-01-09 13:05:32 -06:00 |
|
Ansariel
|
13a509fe05
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# .gitignore
# autobuild.xml
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerregion.h
# indra/newview/llviewerwindow.cpp
|
2022-11-30 22:51:52 +01:00 |
|
Brad Kittenbrink
|
a887c486b4
|
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
|
2022-11-28 16:24:53 -08:00 |
|
Brad Kittenbrink
|
0b188ac04e
|
Merge remote-tracking branch 'origin/main' into DRTVWR-528
|
2022-11-28 14:33:27 -08:00 |
|
Ansariel
|
d5298ac971
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2022-11-20 23:13:06 +01:00 |
|
Dave Parks
|
8d2ac419b2
|
SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers.
|
2022-11-16 14:49:17 -06:00 |
|
Ansariel
|
b3eed96c20
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2022-11-16 15:44:33 +01:00 |
|
Dave Parks
|
843a5c287e
|
SL-18485 Cleanup -- remove unused GLTF specific vertex attributes from LLVertexBuffer (blows past 16-attribute limit)
|
2022-11-14 11:40:18 -06:00 |