82c8675f12
Merge
2019-03-14 12:02:39 -07:00
89f99f6ba4
Pull in Dullahan 1.1.1309 with fix for macOS version
2019-03-12 13:49:21 -07:00
c2ff5a2878
Runtime files required by CEF changed in this version of CEF. We add them to the cef-bin and dullahan 3p packages but they were not copied to the right place - now they are
2019-03-08 21:29:32 -08:00
9203140564
Pick up new version of Dullahan (1.1.1301) that doesn't crash because size change for browser surface was initiated too early
2019-03-08 19:12:19 -08:00
9b93382047
pull in updated 3p-cef-bin package: CEF 3.3626.1895.g7001d56 (Chromium 72.0.3626.121) with fix for CVE-2019-5786
2019-03-08 12:48:10 -08:00
a237325ad6
Merge
2019-03-07 15:26:41 -08:00
8740c54fb0
SL-10700: If a track is empty show the name of the track used below it. If all tracks are empty for a parcel are empty report thath it uses region settings.
2019-03-07 15:26:01 -08:00
2d8152afd9
Merged in graham_linden/viewer-eep-fixes (pull request #298 )
...
SL-10618, SL-10698
2019-03-07 21:32:00 +00:00
423fa1ac29
SL-10618, SL-10698
...
Fix reflection/distortion map culling planes again.
Fix broken handling of shadow disables in ALM forward shaders.
2019-03-07 10:56:26 -08:00
88b53a26ce
SL-10635 Better handlling for unexpected situations
2019-03-07 20:26:15 +02:00
f488e5855a
Remove refs to libatmo libraries (not pulled into cmake anymore).
2019-03-06 11:23:07 -08:00
3f48633b7d
Make octree walk stop thrashing the caches with tex work.
...
Add many more fast timer blocks to differentiate where time goes in UI and Shadow rendering.
2019-03-06 10:09:59 -08:00
3396b728d2
Don't rebuild reflection when only edge water patches are in play.
...
Use (Restore)TexSetup for tex binding (should be equivalent now).
Simplify uniform management in alpha drawpool loop.
Fix wrong modelview mat being used for distortion map gen.
2019-03-05 09:35:04 -08:00
f3303654a5
Roll back even more alpha draw pool optimizations that break particles.
2019-03-04 16:20:31 -08:00
659eaf045e
Fix line-endings.
2019-03-04 15:40:07 -08:00
cc43bee5b1
Factor emissives and fullbrights out of alpha draw pool loop of death.
2019-03-04 14:13:27 -08:00
f1fe689e18
SL-10566
...
Put back old alpha pool draw loop with option to render emissives out of order to save state changes.
2019-03-04 13:19:39 -08:00
0b4982ac89
Roll back optimizations to lldrawpoolalpha causing emissive strangeness and alpha materials lighting errors.
2019-03-04 10:31:55 -08:00
552267f1c9
Fix unused local var 'partition' and avoid assert in rendering highlights.
2019-03-04 09:50:11 -08:00
45a541d2d5
SL-10566
...
Disable pre-cull of water causing refraction/reflection map generation more than is necessary.
Re-org alpha draws to limit state changes based on render type.
2019-03-04 08:04:18 -08:00
4c3050a395
SL-10664, SL-10666
...
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.
Baseline for performance work.
2019-03-03 10:42:19 -08:00
d90b16d350
Merge
2019-03-02 07:18:17 -08:00
d8eff424a5
SL-10664
2019-03-02 07:17:46 -08:00
122e2676ed
Add a command line flag to prevent the viewer from launching the update checker. To use from debugger secondlife-bin->properties->Debugging->Command Arguments add "--skipupdatecheck"
2019-03-01 16:12:10 -08:00
bf8dee73f9
Merge 6.1.1
2019-02-28 18:28:13 -08:00
e1a76999c3
Merge
2019-02-28 16:37:47 -08:00
03db2ddc9c
increment viewer version to 6.1.1
2019-02-28 18:12:29 -05:00
1aa013f75b
Added tag 6.1.0-release for changeset a3143db58a0f
2019-02-28 18:12:28 -05:00
c1d2416826
EEP performance WIP
...
Mods to improve alpha obj render performance.
Removes hacky fix for HUD elements getting atmospherics.
Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding.
Fix up default classes and basic shader loading (remove unused shared modules).
2019-02-28 14:06:19 -08:00
d7ad30a2d4
SL-10566 part the fourth
...
Fix water rendering causing distortion map update very frame.
Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).
Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.
Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.
Re-enable occlusion in distortion map rendering.
2019-02-27 17:07:31 -08:00
ef57351148
SL-10566 part the second
...
Re-enable occlusion for the refracted object culling for the distortion map
(was bloating scene by 3k draw calls when disabled for that pass).
2019-02-26 17:58:52 -08:00
4f1e39d4a4
Fix ifdef in alphaF.
2019-02-26 16:13:32 -08:00
2b9943d6f2
Fix up ifdefs to make OSX shader compiler happy.
2019-02-26 15:07:33 -08:00
6f820163ce
SL-10566 part the first
...
Tie using deferred rendering in water reflection/distortion map generation to debug var again
(claw back some performance lost to doing post-deferred in water map generation).
Edit softenLightF for class1/class2 to make them comparable again.
2019-02-26 14:51:02 -08:00
982b8cdef2
Merge
2019-02-26 10:16:52 -08:00
f9896dc100
SL-5186, SL-10612
...
Fix lighting and gamma correction differences between deferred and forward rendering including materials objects.
Verify 10612 and 10500 remain fixed.
Make sure all necessary deferred shaders get the atmospheric uniform updates for doing frag-based atmospherics.
2019-02-26 10:09:32 -08:00
b6d08e489c
Merged in andreykproductengine/maint-eep (pull request #287 )
...
SL-10635 Crash when loading day cycle from asset
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2019-02-26 17:15:53 +00:00
6b9b8a627f
SL-1945 Autoselection fix
2019-02-26 15:51:33 +02:00
48d1facd90
SL-10635 Crash when loading day cycle from asset
2019-02-26 15:22:00 +02:00
7ac03a6b75
Merge
2019-02-25 14:24:20 -08:00
c42a364841
SL-10165: Using Load Sky/Water when over an existing keyframe replaces the old frame.
2019-02-25 14:23:46 -08:00
738ea418a8
Merged in graham_linden/viewer-eep-rc-fixes (pull request #285 )
...
SL-9806
2019-02-25 21:05:08 +00:00
4879438b14
Disable nSight debug by default (breaks snapshots).
2019-02-25 12:25:02 -08:00
5cd188840d
SL-9806
...
Remove fade effect on sun disc as it nears horizon (stars poke through).
2019-02-25 12:14:59 -08:00
8b0e2e4c82
SL-9806
...
Remove blend effect when sun disc nears horizon (was letting the stars show through).
2019-02-25 12:12:29 -08:00
5158ffa5ce
Merge
2019-02-25 08:38:24 -08:00
6456518135
SL-1945 Autoselection and some crash fixing
2019-02-25 16:51:29 +02:00
bc86ad9523
SL-5186
...
Add ambiance handling to the light loop in the forward incarnation of materialF
and tweak alphaF to match lighing of material alpha-blend objects and non-ALM rendering.
2019-02-22 17:03:11 -08:00
f8f250f80b
Merge
2019-02-22 15:42:07 -08:00
0aa46bb013
Merge
2019-02-22 15:05:13 -08:00
Rider Linden