7d42681501
SL-18239 Unify PBR and non-PBR treatment of ambient/SSAO/irradiance. Restore SSAO to release version.
2022-09-30 10:57:01 -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
abf788175c
SL-18096 WIP -- partial support for double sided rendering. Shadow map and picking support TBD.
2022-09-06 15:07:22 -05:00
852d552ca2
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-02 19:56:35 +01:00
e0c226b04d
SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal maps, fix for crash on shutdown.
2022-09-01 18:06:15 -05:00
3c3442cbbc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-01 15:12:14 +01:00
2c692f635d
DRTVWR-559 refcount max change
2022-09-01 15:11:56 +01:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
1559ad4792
SL-17649 Icon for Material type in Inventory
2022-06-24 13:09:24 +03:00
33fe18c335
SL-17485-b - Attempt to make teamcity builds happy by not referencing a newview global from an llcommon file.
2022-06-17 16:29:39 -07:00
9d9c2037e1
Merge branch 'DRTVWR-564' of bitbucket.org:lindenlab/viewer into SL-17485
2022-06-13 14:03:04 -07:00
bdd76a6a1d
SL-17485 - Provide corrected missing memory data on mac: sAllocatedPageSizeInKB, sAllocatedMemInKB, sAvailPhysicalMemInKB, sMaxPhysicalMemInKB
2022-06-13 13:59:07 -07:00
64209ddeea
SL-17483: Add integration test for CommonControl
...
and for LLViewerControlListener, to which it talks.
Fix glitches detected by the tests.
2022-06-09 17:04:26 -04:00
0bf91fc141
SL-17483: Merge branch 'track-threadpools' into sl-17483.
...
This picks up ThreadPoolSizes override logic embedded in ThreadPool's
constructor, plus the new static ThreadPool::getConfiguredWidth() and
getWidth() methods.
2022-06-09 11:22:01 -04:00
1ff79a430d
SL-17483: Fix ThreadPool::getConfiguredWidth() compile error.
...
Log ThreadPoolSizes at DEBUG level, not INFO.
2022-06-09 11:19:21 -04:00
ac99e979f4
SL-17483: Make it possible to override width of any ThreadPool.
...
Introduce CommonControl, which in a running viewer (or any program containing
an LLViewerControlListener instance) gives access to LLViewerControl
functionality, e.g. getting, setting or enumerating control variables --
without introducing a link dependency on newview.
Make ThreadPool's constructor consult CommonControl to check for an override
for the width of the new ThreadPool in the Global (i.e. gSavedSettings)
setting ThreadPoolSizes, and honor that if found.
Introduce static ThreadPool methods getConfiguredWidth(), to query for such an
override on any particular ThreadPool name; and getWidth(), to ask for the
width of an instance if that instance already exists, else the width with
which it *would* be instantiated.
2022-06-09 10:18:29 -04:00
ef87eb7fa8
SL-17483: Make ThreadPool inherit LLInstanceTracker
...
(cherry picked from commit 41d6a0e222241606c317281e2f0b211e16813dd5)
2022-06-09 09:54:39 -04:00
609476e607
SL-17484 More unit test pruning. Fix for crash when deleting textures.
2022-06-01 09:25:16 -05:00
fc7b5549cb
SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded.
2022-05-31 16:54:05 -05:00
8c5697a2d6
SL-17490 Update Tracy
2022-05-31 08:33:18 -05:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
9bcc01e3e3
SL-17484 Build fix.
2022-05-24 14:30:30 -05:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
ed74d15246
SL-17388 Add SSE version info to ViewerStats
2022-05-18 01:27:25 +03:00
72ddfbd76e
SL-17219: WorkQueue::tryPost() must call ThreadSafeSchedule::tryPush().
...
We inadvertently changed tryPost() to call ThreadSafeSchedule::tryPost(),
which doesn't exist.
2022-05-10 12:18:27 -04:00
cc04903379
Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging
2022-04-28 14:05:49 -07:00
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
b08742d0b3
Add a (broken) material upload handler fxn
2022-04-28 11:53:43 -06: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
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
9b2df75c87
SL-17077 Ensure profiling is disabled if gpu_benchmark fails. Log the source of the real crash for when the viewer inevitably crashes later.
2022-03-25 13:05:50 -05:00
0e954a9afd
SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit builds.
2022-03-09 12:48:52 -06: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
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02: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
d9a68339d5
SL-16815 and SL-16906 Avoid redundant bumpmap generation, add some assertions around ref counting and (hack) fix crash on shutdown from dangling texture reference (reduced to 1 dangling texture from several hundred, can't find the remaining reference).
2022-02-23 16:51:33 -06:00
935c1362a2
Restored SL-14961
...
SL-14961 works better for windows than rethrow
2022-02-14 22:59:26 +02:00
913bddf18f
SL-10190: Slightly reduce conditional clutter in llcoros.{h,cpp}.
...
Rename 'winlevel()' to 'sehandle()'; change it from a static member function
to a free function, thus eliminating the conditional in llcoros.h.
Elsewhere than Windows, provide a zero-cost pass-through sehandle()
implementation, eliminating the conditional in toplevel().
# Conflicts:
# indra/llcommon/llcoros.cpp
# indra/llcommon/llcoros.h
2022-02-11 20:59:16 +02:00
6c3507d6d3
SL-10190: Introduce LLCoros::saveException() and rethrow().
...
This mechanism uses a queue of std::exception_ptrs to transport an (otherwise)
uncaught exception from a terminated coroutine to the thread's main fiber. The
main loop calls LLCoros::rethrow() just after giving some cycles to ready
coroutines that frame.
# Conflicts:
# indra/llcommon/llcoros.cpp
# indra/llcommon/llcoros.h
# indra/newview/llappviewer.cpp
2022-02-11 20:53:21 +02:00
236593e997
Revert "SL-14961 Coroutine crash was not reported to bugsplat"
...
Will be replaced with retrow from nat
2022-02-11 20:28:42 +02:00
855f53901a
SL-16799 Clean up use of hardcoded folder names
2022-02-05 02:59:10 +02:00
efd41b35ac
OPEN-358 Readable error
2022-01-26 02:26:19 +02:00
8aa22b4165
SL-16606: Add profiler category STATS
2022-01-14 11:50:22 -08:00
Dave Parks