Commit Graph

45200 Commits (f9b9de409eca9c85431e55d6b6fefe4de12cbb84)

Author SHA1 Message Date
Sabrina Shanman f9b9de409e Merged in SL-17005_cosmic_win8 (pull request #1090)
SL-17005 - Windows 8 crash fix and more graphics logging

Approved-by: Callum Linden
Approved-by: Dave Parks
2022-08-18 18:08:11 +00:00
Cosmic Linden c790bf7f49 SL-17005: (WIP) (Debug) Add logging and debug settings to assist in understanding Windows 8 failure modes. Most of this should be removed later 2022-08-11 11:10:25 -07:00
Cosmic Linden eac4540fc3 SL-17005: (WIP) (DEBUG) Add logging for graphics adapters 2022-08-09 15:09:14 -07:00
Cosmic Linden 47ee4aff47 SL-17005: Fix crash in initDX when no factory 2022-08-09 11:51:33 -07:00
Howard Stearns c58fd13c63 Merged in SL-17485-b (pull request #1023)
Make teamcity builds happy by not referencing a newview global from an llcommon file
2022-06-18 01:58:20 +00:00
Howard Stearns 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
Howard Stearns db462d48dd Merged in SL-17485-a (pull request #1021)
SL-17485-a - remove xcode compiler flag not supported on current teamcity build host
2022-06-17 17:52:18 +00:00
Howard Stearns 2037e40080 SL-17485-a - remove xcode compiler flag not supported on current teamcity build host 2022-06-17 10:40:52 -07:00
Howard Stearns a42a89001d Merged in SL-17485 (pull request #1016)
SL-17485 - MacOS memory accounting

Approved-by: Dave Parks
2022-06-17 15:17:54 +00:00
Howard Stearns 9d9c2037e1 Merge branch 'DRTVWR-564' of bitbucket.org:lindenlab/viewer into SL-17485 2022-06-13 14:03:04 -07:00
Howard Stearns 91a9665e35 SL-17485 - Make mac compiler happier. 2022-06-13 14:00:13 -07:00
Howard Stearns bdd76a6a1d SL-17485 - Provide corrected missing memory data on mac: sAllocatedPageSizeInKB, sAllocatedMemInKB, sAvailPhysicalMemInKB, sMaxPhysicalMemInKB 2022-06-13 13:59:07 -07:00
Howard Stearns 758a602f20 SL-17485 - mac getVramSize should return all vram, not just texture-specific, and use to compute getAvailableVRAMMegabytes. 2022-06-13 13:52:06 -07:00
Nat Linden c9a48a1cdd Merged in sl-17483 (pull request #1014)
SL-17483: Make LLImageDecodeThread a facade for LL::ThreadPool.

Approved-by: Dave Parks
2022-06-13 19:50:49 +00:00
Nat Goodspeed 3b043d90b6 SL-17483: Per review feedback, avoid LLPointer refcount twiddling
when passing LLPointers into functions. Only increment the refcount when
storing in new ImageRequest.
2022-06-13 15:18:14 -04:00
Nat Goodspeed 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
Nat Goodspeed 1e28b8d992 SL-17483: Let one override keyword into your class...
and all the rest require it, too.
2022-06-09 17:03:28 -04:00
Nat Goodspeed a65e039174 SL-17483: Merge branch 'DRTVWR-563' of viewer into sl-17483 2022-06-09 13:03:58 -04:00
Nat Goodspeed 50dca86f64 SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.
Remove all references to LLQueuedThread (but emulate a couple bits of its API
such as handle_t and getPending()).

Migrate ImageRequest into llimageworker.cpp. It has never been part of
LLImageDecodeThread's public API. Remove ImageRequest tests.

Remove all references to LLImageDecodeThread::pause(). The idea of pausing
another thread is bizarre to me, and LLThreadPool has no such operation. Nor
does it have an abortRequest().
2022-06-09 12:06:23 -04:00
Nat Goodspeed 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
Nat Goodspeed 1ff79a430d SL-17483: Fix ThreadPool::getConfiguredWidth() compile error.
Log ThreadPoolSizes at DEBUG level, not INFO.
2022-06-09 11:19:21 -04:00
Nat Goodspeed 276647789a SL-17483: Simplify ThreadPool instantiations.
Now that LL::ThreadPool's constructor has subsumed the work of discovering a
runtime override width, LLAppViewer::initGeneralThread() can simply pass the
compile-time default width instead of redundantly checking ThreadPoolSizes.

Also the default ThreadPool capacity has been bumped up to what "General" and
"LLImageGL" were requesting, so they need not pass that explicitly or explain
in comments why they're doing it.

But until we start throwing work at the "General" ThreadPool, configure it
down to 1 thread in settings.xml.
2022-06-09 10:36:13 -04:00
Nat Goodspeed 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
Cosmic Linden ef87eb7fa8 SL-17483: Make ThreadPool inherit LLInstanceTracker
(cherry picked from commit 41d6a0e222241606c317281e2f0b211e16813dd5)
2022-06-09 09:54:39 -04:00
Dave Parks da069765b1 SL-17005 Tweak target VRAM usage and add some log spam to help zero in on good targets. 2022-06-08 16:24:03 -05:00
Dave Parks b879c6f3f1 Merge branch 'DRTVWR-563' of bitbucket.org:lindenlab/viewer into DRTVWR-563 2022-06-07 17:27:47 -05:00
Dave Parks 039c6689c9 SL-17547 Fix for crash on shutdown cleaning up LLLFSThread 2022-06-07 17:27:29 -05:00
Sabrina Shanman a4fc01f410 Merged in SL-17489 (pull request #1010)
SL-17489

Approved-by: Dave Parks
2022-06-07 21:19:57 +00:00
Dave Parks 99189ff2d5 SL-17547 Fix for crash on shutdown introduced in last commit. 2022-06-07 15:24:40 -05:00
Dave Parks 197baebc62 SL-17547 Fix for crash in getCurrentDiscardLevelForFetching (and add runtime check and assertion to avoid crash in production and detect crash in development). 2022-06-07 15:12:58 -05:00
Cosmic Linden 7908ae701f SL-17489: Fix map tile log spam and resulting excessive invalid texture requests.
This was affecting map tiles that the agent is not allowed to see (HTTP error: 403 forbidden). The URLs of these map tile requests were then getting cleared, so when these map tiles were re-requested (up to 10 times per second, from LLViewerFetchedTexture::updateFetch), the request would use the wrong URL and get a 404.

Stay in DONE state if there is no new work to do, reducing unneeded requests for textures while leaving open the possibility to re-request a texture at different resolution. Alternatively, we could introduce a new FAILED state here. The current DONE state has nuance, and can either mean "texture loading failed" or "texture successfully loaded at a certain LOD." And a 4xx error is generally irrecoverable. Will strongly consider a FAILED state.

Also, don't clear the map URL, so that any future network requests for the map textures request the correct resource.
2022-06-07 12:17:15 -07:00
Dave Parks 5259fa811c SL-17486 Force desired discard level to 0 for high boosted textures (fix for fuzzy terrain textures etc). 2022-06-06 21:12:48 -05:00
Cosmic Linden a562f6fe51 SL-17489: Improve warning message for fetching texture with improper URL 2022-06-06 14:59:29 -07:00
Dave Parks f4473528eb SL-17485 Remove unused members to make mac build happy. 2022-06-01 11:31:45 -05:00
Dave Parks 4261cbba78 SL-17485 Add texture memory accounting for OS X 2022-06-01 10:34:33 -05:00
Dave Parks 609476e607 SL-17484 More unit test pruning. Fix for crash when deleting textures. 2022-06-01 09:25:16 -05:00
Dave Parks fc7b5549cb SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded. 2022-05-31 16:54:05 -05:00
Dave Parks dfa71e2bb5 SL-17490 Only update a subset of textures each frame and remove dead debug code. 2022-05-31 11:57:15 -05:00
Dave Parks 8c5697a2d6 SL-17490 Update Tracy 2022-05-31 08:33:18 -05:00
Nat Goodspeed cdbd06e8ed Increment viewer version to 6.6.1
following promotion of DRTVWR-546
2022-05-25 19:22:09 -04:00
Dave Parks 41e32126d4 SL-17484 Unit test build fix (remove priority parameters). 2022-05-24 17:48:41 -05:00
Dave Parks 3e9dcba813 SL-17486 Fix for many texture types failing to load. 2022-05-24 17:03:11 -05:00
Dave Parks 9bcc01e3e3 SL-17484 Build fix. 2022-05-24 14:30:30 -05:00
Dave Parks 7fb07008fc Merged in SL-17219 (pull request #992)
SL-17219
2022-05-24 18:38:03 +00:00
Dave Parks 9f9465f5bd Merged DRTVWR-563 into SL-17219 2022-05-24 18:34:52 +00:00
Dave Parks 3365a39080 SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be). 2022-05-19 14:02:48 -05:00
Dave Parks bf183ecff7 SL-17449 Fix for Alexa's hair 2022-05-18 17:56:54 -05:00
Dave Parks c1deab5ba7 SL-17417 Fix for incorrect reflection orientation on fullbright prims. 2022-05-18 15:55:24 -05:00
Nat Goodspeed 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
Dave Parks a936322261 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-05-17 13:23:32 -05:00