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

265 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Ptolemy 5b67aa2c58 SL-16933: Fix texture stat Raw Total always increasing 2022-03-07 19:11:59 -08:00
Ansariel e7bc3f3a5a Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-16 10:54:59 +01: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
Dave Houlton fdc4a81b57 Revert "Merged in euclid-16418 (pull request #846)" 
This reverts commit 40fe5277e1, reversing
changes made to af830e5fc5.
 2022-02-01 15:49:32 -07:00
Dave Houlton d28a271fa8 SL-16418 add some big-endian future-proofing 2022-01-28 09:43:21 -07:00
Dave Houlton 8d0efb54db SL-16418 rename media tex image per-update to avoid contention stall 2022-01-27 17:09:29 -07:00
Dave Houlton c8926630af SL-16418 optimize imageraw clear 2022-01-27 15:44:35 -07:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519 
# Conflicts:
#	README.md
 2021-11-16 01:21:05 +02:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 3e355ede77 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-10 13:53:28 +02:00
Andrey Kleshchev dc1d8031f1 SL-15788 Crash throw_std_bad_alloc in LLImageRaw's scale 2021-08-09 23:55:05 +03:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Ansariel af2abe17cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 00:51:42 +01:00
Beq b785b9d1ae Crash avoidance for compositeUnscaled4onto3 2020-10-22 22:52:02 +01:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. 2020-09-16 18:53:24 -07:00
Ansariel 98129be5ef Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-06-17 15:45:05 +02:00
Andrey Kleshchev 372ed555ed SL-13348 Thread crashing singleton #2 
Reverted LLImage to singleton conversion
 2020-05-29 21:53:43 +03:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
Ansariel a154630ecd Merge 494-maint-wassail 2019-11-19 21:51:54 +01:00
Ansariel 3bc189bda7 Merge Firestorm LGPL 2019-11-19 20:28:09 +01:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel daa60fdb2c Merge viewer-neko 2019-08-13 20:32:40 +02:00
andreykproductengine 55983b9abd SL-10908 One more safeguard 2019-08-05 20:52:18 +03:00
andreykproductengine 17fae30f72 DRTVWR-493 LLImage to LLParamSingleton 2019-07-25 15:17:11 +03:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
Ansariel cb20bc0425 Merge viewer-neko 2018-08-01 01:20:01 +02:00
andreykproductengine e24d4c9f4d MAINT-8923 Better allocation failure handling, createGLTexture crashes 2018-07-26 20:06:26 +03:00
Ansariel 31a1ba1701 Merge Firestorm LGPL 2018-05-08 18:31:13 +02:00
Nicky 7cc408a5cd Merge. 2018-04-10 12:33:45 +02:00
Nicky ef20e3f523 Replace ARP Mutex and Condition with std::mutx and std::conditional_variable 2018-04-05 12:02:12 +02:00
Ansariel 25350b9422 Merge viewer-neko 2018-01-30 15:39:28 +01:00
Andrey Kleshchev 6e445e82e2 MAINT-8091 Removed deprecated and unused private memory pooling 2018-01-30 14:03:26 +00:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00
Ansariel e7715f7a31 Merge Firestorm LGPL 2017-11-30 20:33:07 +01:00
Nat Goodspeed e3a2c5e321 DRTVWR-418: Merge from latest viewer-release 2017-11-29 14:47:09 -05:00
andreykproductengine e5ef898728 MAINT-8028 Fixed memory leak in allocateDataSize() 2017-11-27 15:02:33 +02:00
andreykproductengine 01c7af846f MAINT-8028 Fixed memory leak in allocateDataSize() 2017-11-27 15:02:33 +02:00
Ansariel 960f20e437 Merge Firestorm LGPL 2017-10-28 20:20:14 +02:00
Ansariel 8084ccff3a MAINT-7633 Crash fix 2017-10-27 23:41:08 +02:00
andreykproductengine d7732280a9 Merged from viewer-lynx 2017-10-27 21:00:18 +03:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04:00
Ansariel 06db7c626f Merge Firestorm LGPL 2017-10-11 17:58:16 +02:00
Ansariel 615336a4d4 Merge viewer-neko 2017-09-07 21:49:12 +02:00
ruslantproductengine 6dcde6469d [SL-711] - Eliminate some overheads in texturecache. 
- Eliminate memory overhead when need duplicated scaled image.
- Small improvement in LLImageBase::getCodecFromExtension()
 2017-06-06 15:30:03 +03:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
AndreyL ProductEngine a65b586b18 MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha() 2016-12-08 17:21:05 +02:00
AndreyL ProductEngine 99d76f85f9 MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha() 2016-12-08 17:21:05 +02:00
Ansariel ae2e40d5d7 Merge "MAINT-6818 Fix for LLImageBase::allocateData crash" with our fix 2016-11-18 17:54:35 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
AndreyL ProductEngine f75ea457c8 MAINT-6818 Fix for LLImageBase::allocateData crash 2016-10-19 01:12:52 +03:00
Nicky fa22626882 Merge. 2016-09-27 11:25:13 +02:00
Nicky d7a0835432 Merge. 2016-09-26 21:12:34 +02:00
Rider Linden 100aa4b79e Merge 2016-09-16 14:59:52 -07:00
Oz Linden 8c86c594be paren fix 2016-09-06 11:01:02 -04:00
Oz Linden 53f9fbcfb7 add run time error checking to LLImageRaw::scale 2016-09-06 09:11:10 -04:00
Ansariel 09b9913d35 Merge viewer-vob 2016-08-29 11:40:53 +02:00
Ansariel cb89140d29 Merge LL release 4.0.7 2016-08-11 23:42:52 +02:00
AndreyL ProductEngine 5e02d304f0 MAINT-6618 More checks 2016-08-09 19:26:30 +03:00
AndreyL ProductEngine d4b1db277c MAINT-6618 Fixed the crash in LLImageRaw::scale() + some additional checks 2016-08-09 05:07:39 +03:00
AndreyL ProductEngine 2339e759fc MAINT-4327/MAINT-6584 Supress the crash on memory allocation error when decoding J2C images 2016-07-27 05:49:07 +03:00
Nat Goodspeed acdb050ce5 MAINT-6584: Convert LLImage class hierarchy to standard 'bool' 
instead of legacy BOOL.
 2016-07-22 11:35:23 -04:00
Nicky e8aa2dd71f x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size. 
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
 2016-04-22 14:58:25 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
ruslantproductengine 6de01b2b12 Hotfix for build on OSX with -Werror,-Wtautological-compare 2015-05-05 21:09:33 +03:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
ruslantproductengine c3affc4d6b Hotfix for build on OSX with -Werror,-Wtautological-compare 2015-05-05 21:05:13 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
ruslantproductengine a7530cb3fa MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 14:06:42 +02:00
ruslantproductengine ef67802a19 Backed out changeset: 81b8de17a195 2015-02-23 14:03:07 +02:00
ruslantproductengine 6926a6977d MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 13:14:25 +02:00
ruslantproductengine 32bb73eff4 Backed out changeset: 4c24cfce033a 2015-02-23 13:11:34 +02:00
ruslantproductengine 59fb68799c MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 12:45:28 +02:00
ruslantproductengine 8c819b6980 MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 2015-02-20 01:32:24 +02:00
ruslantproductengine 4042617479 MAINT-4329 Backed out changeset: fd3a4d5c2cf5 2015-02-13 20:05:48 +02:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Ansariel 1f465086c0 Merge LL V3.7.10 2015-01-11 18:40:22 +01:00
ruslantproductengine 41170b5603 MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2 2014-09-25 21:19:17 +03:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Merov Linden 6bf3cb875c ACME-1195 : WIP : Lazy evaluate intermediate images in snapshot preview so perf is better in common cases, allow thumbnail to be computed from grabed frame (for SL Share), thumbnail display still buggy in SL Share 2014-01-28 10:19:57 -08:00
Merov Linden 4b2e69d8e0 ACME-1236 : Clean up llimage after refactoring so there's no difference with viewer-release 2014-01-15 10:27:49 -08:00
Merov Linden 7cc64a09a3 ACME-1236 : Refactor filters and vignette into llimagefilter, add example filters to llimage_libtest 2014-01-14 21:01:51 -08:00
Merov Linden 0c7cab771c ACME-1236 : Add lines as a new type of vignette and Brightscan as an example 2014-01-09 21:58:30 -08:00
Merov Linden 70b877da0e Fix ambiguous pow call (use powf) instead 2014-01-08 21:19:21 -08:00
Merov Linden 3161d822ab ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency) 2014-01-08 15:41:42 -08:00
Merov Linden c2a974f155 ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter 2014-01-07 22:10:23 -08:00