Commit Graph

3388 Commits (c5e3ace94de01ed61ed43284ea72dacec197cdc9)

Author SHA1 Message Date
Mnikolenko Productengine 1559ad4792 SL-17649 Icon for Material type in Inventory 2022-06-24 13:09:24 +03:00
Dave Parks 6c6d9a10f8 SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation. 2022-05-20 13:31:18 -05:00
Brad Kittenbrink cc04903379 Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging 2022-04-28 14:05:49 -07:00
Brad Kittenbrink c9ef206e39 Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
Dave Houlton b08742d0b3 Add a (broken) material upload handler fxn 2022-04-28 11:53:43 -06: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
Dave Parks 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
Dave Parks 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
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 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
Ptolemy 8aa22b4165 SL-16606: Add profiler category STATS 2022-01-14 11:50:22 -08:00
Ptolemy b504c69255 SL-16606: Add profiler category THREAD 2022-01-14 11:50:21 -08:00
Ptolemy 12fd860636 SL-16606: Add profiler category STRING 2022-01-14 11:50:21 -08:00
Ptolemy 31b0e8cef8 SL-16606: Add profiler category STATS 2022-01-14 11:50:21 -08:00
Ptolemy 9f2be2a054 SL-16606: Add profiler category MEMORY 2022-01-14 11:50:20 -08:00
Ptolemy 6e306cd7ce SL-16606: Add profiler category LOGGING 2022-01-14 11:50:20 -08:00
Ptolemy 3a9ce9f226 SL-16606: Add profiler category LLSD 2022-01-14 11:50:19 -08:00
Ptolemy f9031ee02d SL-16606: Include profiler categories automatically 2022-01-14 11:50:18 -08:00
Ptolemy c37c727a9b SL-16606: Add categories 2022-01-14 11:50:18 -08:00
Andrey Kleshchev 093395b489 SL-15997 Windows 11 detection #2 2022-01-12 21:31:24 +02:00
Andrey Kleshchev a3d14e89a3 SL-15997 Windows 11 detection 2022-01-12 21:30:43 +02: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 Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Andrey Lihatskiy 83b4ea59fc Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
Bennett Goble 0b95b9d008 Merge branch 'master' into SL-15742 2021-12-11 10:29:37 -08:00
Bennett Goble f729cfc33f SL-15742: Convert build scripts to Python 3
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.

Breaking change: Python 2 support ending

Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.

Notes

- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
Nat Goodspeed 04ebc11a2d SL-16094: Fix WorkQueue test for correct behavior of runFor().
Turns out that one of our WorkQueue integration tests was relying on the
incorrect runFor() behavior that we just fixed, so the test broke. Now that
runFor() doesn't wait around for work to be posted, use an explicit wait loop
instead.

To support this, add LLCond::get(functor), where functor must accept a const
reference to the stored data. This new get() returns whatever the functor
returns, allowing a caller to peek at the stored data.

Also use universal references for all remaining LLCond functor arguments.
2021-11-24 12:56:48 -05:00
Nat Goodspeed 0b066539fe DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.

This reverts commit 029b41c041.
2021-11-24 10:47:54 -05:00
Nat Goodspeed 78d837789a SL-16400: Make WorkQueue::runFor() and runUntil() stop when done.
runFor(interval) and runUntil(timestamp) are intended, and documented, to run
*no longer than* the specified time. Instead, the initial implementation
always waited the full specified time, hoping for work to arrive. Fix that:
once we clear work that's already pending, return right away.
2021-11-24 09:43:37 -05:00
Nat Goodspeed 877a02dba1 SL-16094: Fix merge glitches from previous revert. 2021-11-24 09:38:56 -05:00
Nat Goodspeed d71e0a6d47 SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread 2021-11-23 21:23:45 -05:00
Nat Goodspeed 2b96f89c2a SL-16400: Add ThreadPool::start() method, and call it.
It's sometimes important to finish other initialization before launching the
threads in the ThreadPool, so make that an explicit step. In particular, we
were launching the LLImageGL texture thread before initializing the GL
context, resulting in all gray textures.
2021-11-23 20:39:32 -05:00
Nat Goodspeed 6d36038e40 Merge branch 'glthread' of ssh://bitbucket.org/lindenlab/viewer into glthreadx 2021-11-23 15:41:46 -05:00
Nat Goodspeed 30cf50e6af SL-16094: Support ll_convert<std::string>(const char*)
and correspondingly, ll_convert<std::wstring>(const wchar_t*).

Now that we're using ll_convert() for single-argument stringize(arg), make
sure it can efficiently handle the simple case of constructing a string from a
const char pointer.
2021-11-23 14:25:16 -05:00
Nat Goodspeed adc2666dbb SL-16094: Tweak llstring merge 2021-11-23 10:11:16 -05:00
Nat Goodspeed 3b8fc6b9b1 SL-16094: Merge llstring work from SL-16207 2021-11-23 10:09:26 -05:00
Nat Goodspeed a32a45163d SL-16094: Extend stringize() to support variadic arguments.
It's useful to be able to say STRINGIZE(item0 << item1 << item2), and we use
that a lot in our code base. But weird syntax aside, there are a couple
advantages to being able to write stringize(item0, item1, item2).

First, it allows stringize() to be used from within some other variadic
function, without having to make that function a macro that accepts an
arbitrary insertion-operator expression. There's no such thing as a member
macro.

Second, particularly for variadic functions, it allows us to optimize the
single-argument case stringize(item0). A macro can't do that. When item0 is
already a string of the desired char type, instead of streaming it into a
std::ostringstream and retrieving it again, we can simply return the input
string. When it's a pointer to the desired char type, we can directly
construct the result string without the help of std::ostringstream. When it's
a string of some other char type, we can engage ll_convert() to perform needed
conversions.

We generalize and optimize the generic gstringize() function, retaining the
role of stringize() and wstringize() as thin wrappers that merely provide the
desired char type.

Optimizing the single-argument case requires separately defining gstringize()
with two or more arguments: the general case. Then gstringize(arg) is
delegated to a gstringize_impl class template so we can partially specialize
to recognize a std::basic_string<desired_char_type> argument, as well as
desired_char_type*. Both these specializations engage ll_convert(), which
already handles the trivial case when no conversion is required.

Use of ll_convert() in this role supercedes and generalizes the previous
wstring_to_utf8str() and utf8str_to_wstring() overloads.

Also introduce stream_to(std::ostream&, ...) to support variadic streaming to
other destinations, e.g. a file, std::cout, ...
2021-11-23 09:58:54 -05:00
Runitai Linden 9b0d8c7e62 SL-16094 More profile hooks for threading code, remove redundant wglCreateContextAttribs call 2021-11-22 18:42:56 -06:00
Runitai Linden cc34e26ef7 SL-16094 Add WorkQueue profile hooks 2021-11-22 11:51:03 -06:00
Nat Goodspeed 3171aaad9b SL-16094: fix merge glitch 2021-11-19 14:57:36 -05:00
Nat Goodspeed f997bcd186 SL-16094: Stylish braces!
(cherry picked from commit 18de6c9b98)
2021-11-19 14:56:30 -05:00
Nat Goodspeed 106d52c6ee SL-16202: Instantiate LLSimpleton::sInstance generically
instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.

(cherry picked from commit 8458ad8890)
2021-11-19 14:53:12 -05:00
Brad Payne (Vir Linden) 730b8427b5 SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window 2021-11-19 14:43:19 -05:00
Nat Goodspeed 18de6c9b98 SL-16094: Stylish braces! 2021-11-19 14:43:19 -05:00
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
Andrey Kleshchev 7f0fcfa332 SL-15241 Cleanup 2021-11-17 23:28:50 +02:00