7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
8c16ec2b53
Convert BOOL to bool in LLControlGroup and related classes
2024-02-21 03:00:25 +02:00
cbf202d632
SL-19750: Only disable PBR terrain emissive for machines that have a limit of 16 texture binds. Bump featuretable
2023-10-13 10:33:18 -07:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
97c6bf8f74
Readded RenderClass1MemoryBandwidth setting after DRTVWR-559 & DRTVWR-539 merge
...
Has to use class1 now since class0 shouldn't ever be in use on
end-user systems anymore.
2023-04-27 18:04:49 -07:00
dc813181a5
More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge
2023-04-27 13:51:42 -07:00
513ac361b1
Got things to compile again after DRTVWR-559 & DRTVWR-539 merge.
...
removing dead code and references to members that don't exist anymore
2023-04-26 17:34:43 -07:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
6c554c9c92
Fix up the graphics setting detection
...
SL-18563
2023-03-27 15:06:25 -07:00
d611734c04
SL-15752 Reduce default graphical quality on machines with little memory ( #105 )
2023-03-04 02:29:48 +02:00
d5e558fffc
SL-19277 Fix for fallback probe sometimes getting occluded and making void water dark after teleport. Never default to having reflections off.
2023-02-28 08:49:15 -06:00
10b8dcc497
SL-19015 Bump probe resolution back to 256 by default (drop to 128 if vram < 2GB), remove irradiance map feedback loop (one bounce, but but more stable and allows for much brighter first bounce), make sky contribution to irradiance not tint the world blue. Make irradiance that appears in radiance maps match world irradiance.
2023-01-30 18:56:19 -06:00
e5d463ca20
SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
2022-09-22 17:27:18 -05:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
013a713001
SL-17967 - slightly more meaningful ogl error reporting
2022-09-02 15:44:19 -07:00
79c9a8a4b7
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-04-26 16:03:03 +03: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
9c7ec66d24
SL-16691 Add GPU memory bandwidth to ViewerStats
2022-01-24 11:04:11 -06:00
f145d0dbe1
SL-16447 Adjust default graphics preferences based on modern memory bandwidth levels and bias settings based on CPU speed.
2022-01-21 16:18:54 -06:00
66d88733ee
SL-16454 FIXED Performance viewer login screen is black after a Release viewer session.
2021-12-07 19:15:50 +02:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
3e99853b29
SL-16138 remove checks for now-mandatory capabilities
2021-10-06 10:59:00 -06:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
bb4d02446f
SL-14347 Crash at ChoosePixelFormat SEH
2020-12-01 18:22:24 +02:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
1c17e51279
DRTVWR-440, whitespace change to test TeamCity trigger
2020-01-22 13:06:57 -07:00
24a0601a50
DRTVWR-493 Reworked a number of inits
2019-08-13 20:19:46 +03:00
1197da3cdf
MAINT-8974 Reduce default settings for intel GPUs in case of failed benchmark
2018-08-09 15:57:48 +03:00
e236da41e9
MAINT-8197 Compliment benchmark crash processing with SEH handling
2018-08-06 19:56:44 +03:00
1b23621756
Merged lindenlab/viewer-neko into default
2018-06-11 14:28:30 +03:00
d98df5ec2b
MAINT-8730 Remove unused fetchFeatureTable code
2018-06-07 16:33:52 +03:00
546fc96f01
MAINT-8721 Enabled benchmarking for Intel GPUs
2018-06-04 23:18:37 +03:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
d62ad1ef8a
merge changes for 5.0.8-release
2017-10-11 09:13:55 -04:00
ee2cd159a5
add logging for skipping benchmark (and fixed some log tags)
2017-07-12 15:04:50 -04:00
5c1d9d65f6
fix missing declaration
2017-07-06 16:09:44 -07:00
42a8dbbd16
upgrade to VMP package 507104
2017-07-06 15:44:13 -07:00
c21b3bbacc
MAINT-7739 Make LLOSInfo a Singleton
2017-08-25 20:26:25 +03:00
f9e049c9e5
add some extra logging to feature table parsing
2017-05-15 15:09:57 -04:00
52899ed62a
DRTVWR-418, MAINT-6996: Rationalize LLMemory wrt 64-bit support.
...
There were two distinct LLMemory methods getCurrentRSS() and
getWorkingSetSize(). It was pointless to have both: on Windows they were
completely redundant; on other platforms getWorkingSetSize() always returned
0. (Amusingly, though the Windows implementations both made exactly the same
GetProcessMemoryInfo() call and used exactly the same logic, the code was
different in the two -- as though the second was implemented without awareness
of the first, even though they were adjacent in the source file.)
One of the actual MAINT-6996 problems was due to the fact that
getWorkingSetSize() returned U32, where getCurrentRSS() returns U64. In other
words, getWorkingSetSize() was both useless *and* wrong. Remove it, and change
its one call to getCurrentRSS() instead.
The other culprit was that in several places, the 64-bit WorkingSetSize
returned by the Windows GetProcessMemoryInfo() call (and by getCurrentRSS())
was explicitly cast to a 32-bit data type. That works only when explicitly or
implicitly (using LLUnits type conversion) scaling the value to kilobytes or
megabytes. When the size in bytes is desired, use 64-bit types instead.
In addition to the symptoms, LLMemory was overdue for a bit of cleanup.
There was a 16K block of memory called reserveMem, the comment on which read:
"reserve 16K for out of memory error handling." Yet *nothing* was ever done
with that block! If it were going to be useful, one would think someone would
at some point explicitly free the block. In fact there was a method
freeReserve(), apparently for just that purpose -- which was never called. As
things stood, reserveMem served only to *prevent* the viewer from ever using
that chunk of memory. Remove reserveMem and the unused freeReserve().
The only function of initClass() and cleanupClass() was to allocate and free
reserveMem. Remove initClass(), cleanupClass() and the LLCommon calls to them.
In a similar vein, there was an LLMemoryInfo::getPhysicalMemoryClamped()
method that returned U32Bytes. Its job was simply to return a size in bytes
that could fit into a U32 data type, returning U32_MAX if the 64-bit value
exceeded 4GB. Eliminate that; change all its calls to getPhysicalMemoryKB()
(which getPhysicalMemoryClamped() used internally anyway). We no longer care
about any platform that cannot handle 64-bit data types.
2017-05-02 10:51:18 -04:00
0d5edb03a2
MAINT-6435 Deafult preset should set the same settings as the "Reset to recommended settings" button
2016-05-27 03:34:37 +03:00
Brad Linden