1ca8584322
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-22 15:48:47 +02:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
2aceea66ff
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/newview/llfloateropenobject.cpp
# indra/newview/llfloateropenobject.h
# indra/newview/llmaterialmgr.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/skins/default/xui/en/floater_openobject.xml
2022-10-01 13:10:39 +02:00
1b31ab5c52
Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces
2022-09-27 17:59:21 -04:00
c3eb62664b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-09-26 15:21:07 +02:00
75de4d3276
SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes.
2022-09-23 12:53:24 -05:00
9756e0e89e
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
2022-09-17 12:02:14 +02:00
09f3d6eaee
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-16 16:25:38 -05:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
5a78473123
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
2022-09-16 11:23:28 +02:00
5178e59b59
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-16 09:37:16 +02:00
82ab5f9765
SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to recover mesh's original coordinate frame when generating tangents post download.
2022-09-15 17:23:34 -05:00
2507bc6137
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 20:37:16 +02:00
656dd12dfc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:35:44 +02:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
e49d602bd9
SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents in the mesh's original coordinate frame.
2022-09-12 19:48:33 -05:00
d7c77e5c64
SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents
2022-09-12 11:48:16 -05:00
c822da9fe6
SL-18095 WIP -- Allow mikktspace generator to add more vertices (skip re-welding step for now).
2022-09-09 20:56:22 -05:00
8b1f80c8ce
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-08 18:44:46 +02:00
8ad7240a3b
SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and switch to per-pixel binormal generation. Still bugged with some test content.
2022-09-08 10:06:53 -05:00
41d07e237a
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-08-31 16:05:55 +02:00
09400b74ad
SL-17902 Crash at LLAlignedArray, out of bounds
2022-08-04 22:14:08 +03:00
bf24665fa6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 16:36:35 +02:00
49b6f9b312
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 14:52:20 +02:00
6d09c9ff89
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 12:37:05 +02:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
dfc1175546
Merge branch 'master' into DRTVWR-565-maint-P
2022-08-04 00:12:26 +03:00
0d0d82fa97
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-08-02 12:08:32 +02:00
1e50da6b7a
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-07-27 02:06:54 +02:00
cdff716908
SL-17801: Don't let external code delete the raw pointer to the picking octree
2022-07-26 10:40:19 -07:00
f1128da8da
SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations
2022-07-26 10:40:19 -07:00
9232846287
Build fix
2022-07-22 12:41:14 +02:00
f9f81ebe20
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-07-22 12:19:11 +02:00
4ef83bb8bd
SL-17801: Add various safeguards to keep triangle indices count valid
2022-07-21 15:19:00 -07:00
33621382b4
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloateroutfitsnapshot.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
2022-07-21 19:54:15 +02:00
f4e6ccc2c4
SL-17796 Crash at LLVolumeFace::getVertexData
2022-07-19 21:08:51 +03:00
a330095650
SL-16793 Potential crash at createSide
2022-07-07 00:01:33 +03:00
c01388fb0b
SL-16793 Crash at LLProfile::addHole
...
addHole can be accessed from main tread and from mesh thread, safeguard pt
2022-07-06 21:24:25 +03:00
d5501d459b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-01 11:36:10 +02:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
162280cd98
SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree.
2022-06-21 12:33:32 -07:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
f451672b0c
SL-17475 Fix wrong remap buffer size
2022-06-16 16:46:04 +03:00
b1cbf369cf
SL-17475 Use a shadow indices buffer before simplification
2022-06-14 21:41:27 +03:00
45bcefd981
SL-17475 fix remap causing an assert
2022-06-14 16:40:56 +03:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
c9407feece
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-10 19:14:02 +02:00
43517c5adc
SL-17244 Fix 'empty leaf' crashes
2022-05-05 19:41:56 +03:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
e7bc3f3a5a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-16 10:54:59 +01:00
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
a71f772cc3
SL-16606: Add profiler category VOLUME
2022-01-14 11:50:21 -08:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
a1349c14dd
SL-16413 Handle out of memory llface allocations
2021-11-25 00:00:29 +02:00
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
bfcb1f61a8
SL-16263 RaiseException in LLVolumeFace::createSide
2021-10-28 01:27:18 +03:00
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
fea2d7bacc
SL-16152 _Allocate failed
2021-10-08 01:32:48 +03:00
8e4907beee
SL-16014: Add Tracy markup for LLVolumeFace
2021-09-22 14:38:43 -07:00
8e725e74aa
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #2
2021-07-26 21:20:53 +03:00
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01:00
e5cbf1607a
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 22:19:54 +02:00
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
a0bcb42352
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-04-30 14:11:34 +02:00
99a50b2bb5
Linux; FIRE-29492: completely disable cacheOptimize again.
2020-04-27 13:32:14 +02:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
797fa6718b
Merge 494-maint-wassail
2019-11-28 17:09:26 +01:00
bc496f5f17
Downstream merge from lindenlab/viewer-lynx
2019-11-27 22:58:52 +02:00
3d88b2587d
SL-12322 addTriangle crash
2019-11-21 17:49:03 +02:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
6fa34eff70
Merge Firestorm LGPL
2019-10-14 18:06:42 +02:00
84d7c832cb
Make indices 32 bit to avoid overflows.
2019-10-13 18:50:32 +02:00
f3855085f5
FIRE-23370 / Linux; cache optimize volume faces again without destroying the triangle mesh.
2019-10-12 06:59:39 +02:00
af5779a8fa
Merge Firestorm LGPL
2019-08-14 17:37:18 +02:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
d9888f07f3
FIRE-23370/BUG-8801/MAIN-5060/Linux; (For now) disable LLVolumeFace::cacheOptimize as it can destroy the triangle definition of a meshes.
2019-07-23 16:20:34 +02:00
Ansariel