livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,081 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

373 Commits (5fabfa50d7135d29c0cb8a553006cf9038f9baae)

Author SHA1 Message Date
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Brad Linden eb526fec0a Merge remote-tracking branch 'origin/main' into DRTVWR-559 2022-12-12 17:59:34 -08:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Andrey Kleshchev 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
Andrey Lihatskiy 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
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Rye Mutt 1b31ab5c52 Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces 2022-09-27 17:59:21 -04:00
Dave Parks 75de4d3276 SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes. 2022-09-23 12:53:24 -05:00
Dave Parks 09f3d6eaee Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-09-16 16:25:38 -05:00
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Andrey Kleshchev 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
Dave Parks 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
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Dave Parks 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
Dave Parks d7c77e5c64 SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents 2022-09-12 11:48:16 -05:00
Dave Parks 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
Dave Parks 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
Andrey Kleshchev 09400b74ad SL-17902 Crash at LLAlignedArray, out of bounds 2022-08-04 22:14:08 +03:00
Andrey Lihatskiy 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
Andrey Lihatskiy 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
Andrey Lihatskiy dfc1175546 Merge branch 'master' into DRTVWR-565-maint-P 2022-08-04 00:12:26 +03:00
Cosmic Linden cdff716908 SL-17801: Don't let external code delete the raw pointer to the picking octree 2022-07-26 10:40:19 -07:00
Cosmic Linden 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
Cosmic Linden 4ef83bb8bd SL-17801: Add various safeguards to keep triangle indices count valid 2022-07-21 15:19:00 -07:00
Andrey Kleshchev f4e6ccc2c4 SL-17796 Crash at LLVolumeFace::getVertexData 2022-07-19 21:08:51 +03:00
Andrey Kleshchev a330095650 SL-16793 Potential crash at createSide 2022-07-07 00:01:33 +03:00
Andrey Kleshchev 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
Cosmic Linden 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
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Andrey Kleshchev f451672b0c SL-17475 Fix wrong remap buffer size 2022-06-16 16:46:04 +03:00
Andrey Kleshchev b1cbf369cf SL-17475 Use a shadow indices buffer before simplification 2022-06-14 21:41:27 +03:00
Andrey Kleshchev 45bcefd981 SL-17475 fix remap causing an assert 2022-06-14 16:40:56 +03:00
Andrey Kleshchev b08340f183 SL-17475 Remap models before simplification 2022-06-11 10:23:46 +03:00
Andrey Kleshchev 43517c5adc SL-17244 Fix 'empty leaf' crashes 2022-05-05 19:41:56 +03:00
Andrey Kleshchev 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
Andrey Kleshchev 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
Andrey Lihatskiy 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
Dave Parks 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
Ptolemy a71f772cc3 SL-16606: Add profiler category VOLUME 2022-01-14 11:50:21 -08:00
Andrey Lihatskiy 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
Andrey Kleshchev 27e4e245d9 Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
Andrey Kleshchev a1349c14dd SL-16413 Handle out of memory llface allocations 2021-11-25 00:00:29 +02:00
Andrey Kleshchev bfcb1f61a8 SL-16263 RaiseException in LLVolumeFace::createSide 2021-10-28 01:27:18 +03:00
Andrey Kleshchev fea2d7bacc SL-16152 _Allocate failed 2021-10-08 01:32:48 +03:00
Ptolemy 8e4907beee SL-16014: Add Tracy markup for LLVolumeFace 2021-09-22 14:38:43 -07:00
Andrey Kleshchev 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
Andrey Kleshchev 8a64ded50f SL-14119 Crash at LLVolumeFace::cacheOptimize 2020-10-14 11:48:07 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00