Commit Graph

40448 Commits (ee68e52dc83d5f00acb4da96aca6148ffbd89920)

Author SHA1 Message Date
Rider Linden ee68e52dc8 Merge 2019-03-18 14:05:02 -07:00
Rider Linden 179c412a6d Update viewer version to 6.2.0 2019-03-18 11:03:04 -07:00
andreykproductengine 7171e581f9 BUG-226547 Crashfixes 2019-03-18 17:08:17 +02:00
Rider Linden bf8530c936 Merge 2019-03-15 16:37:38 -07:00
callum@gmail.com 2046e01f80 Pull in updated Dullahan (1.1.1313) with a fix for the DullahanHelper.app icon appearing in the Apple Dock 2019-03-15 14:36:21 -07:00
Graham Linden d5f3e7f28e Disable optimizations to batch fullbright and emissive draws together to minimize GL blend state changes. 2019-03-15 14:09:23 -07:00
Graham Linden 83941a5ec6 Restore optimizations for fullbright/emissives with changes to fix lighting breakage when they're in play. 2019-03-15 13:05:56 -07:00
Graham Linden 4a5e7350e7 Merge 2019-03-15 11:02:17 -07:00
Graham Linden a10ec81e82 SL-10743, SL-10744
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.

Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
andreykproductengine 58582fb621 SL-10672 Fixed Sun transitioned to image from previous keyframe 2019-03-15 14:44:52 +02:00
Rider Linden 6304186421 Merge 2019-03-14 12:03:34 -07:00
Rider Linden 82c8675f12 Merge 2019-03-14 12:02:39 -07:00
Graham Linden 7021c7a8db Remove unused cloud shadow shader var for Clang. 2019-03-14 07:23:47 -07:00
Graham Linden 8f45250f64 Put back test diff from viewer-release that should be. 2019-03-13 16:43:50 -07:00
Graham Linden a86a691354 Further tab restoration and whitespace delta minimization. 2019-03-13 15:25:07 -07:00
Graham Linden c10754ea6d SL-10741
Remove shadow influence on ambient term causing inverted lighting in extreme setups.
2019-03-13 13:56:04 -07:00
Graham Linden 898c9f4421 Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR. 2019-03-13 13:21:48 -07:00
callum@gmail.com 89f99f6ba4 Pull in Dullahan 1.1.1309 with fix for macOS version 2019-03-12 13:49:21 -07:00
Graham Linden 868cd32e5e More tab restoration.
Also fix ref to removed extra GLSL link module.

'warn-on-failure:no-tabs'
2019-03-12 11:07:23 -07:00
Graham Linden 15270f697a Tab restoration project.
'warn-on-failure:no-tabs'
2019-03-12 10:52:00 -07:00
Graham Linden 4f724f6304 SL-10732
Fix accum of shadow weights and handling of clipped areas in spot shadow sampling.
2019-03-12 10:18:52 -07:00
callum_linden 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
callum@gmail.com 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
Rider Linden 5f01cf3b1c SL-10702: Mac gets very picky about override. (or MSVC isn't picky enough) 2019-03-08 17:47:11 -08:00
Rider Linden e1e0dcc040 SL-10702: When attempting a new voice connection, ensure that the voicePump mail drop does not have any outstanding events. 2019-03-08 17:34:49 -08:00
callum@gmail.com 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
Graham Linden b5bcba51b2 Fix tabs. 2019-03-08 09:19:05 -08:00
Graham Linden 0d32b5bf20 Merge 2019-03-08 09:17:14 -08:00
Rider Linden a237325ad6 Merge 2019-03-07 15:26:41 -08:00
Rider Linden 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
Graham Linden 53f3755a46 Fix tabs. 2019-03-07 15:09:34 -08:00
Graham Linden dc4b34966a SL-10421
Add pointer checks to possibly avoid bugsplat autoreported crash.
2019-03-07 13:46:40 -08:00
Rider Linden 2d8152afd9 Merged in graham_linden/viewer-eep-fixes (pull request #298)
SL-10618, SL-10698
2019-03-07 21:32:00 +00:00
Graham Linden 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
andreykproductengine 88b53a26ce SL-10635 Better handlling for unexpected situations 2019-03-07 20:26:15 +02:00
Graham Linden f488e5855a Remove refs to libatmo libraries (not pulled into cmake anymore). 2019-03-06 11:23:07 -08:00
Graham Linden 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
Graham Linden 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
Graham Linden f3303654a5 Roll back even more alpha draw pool optimizations that break particles. 2019-03-04 16:20:31 -08:00
Graham Linden 659eaf045e Fix line-endings. 2019-03-04 15:40:07 -08:00
Graham Linden cc43bee5b1 Factor emissives and fullbrights out of alpha draw pool loop of death. 2019-03-04 14:13:27 -08:00
Graham Linden 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
Graham Linden 0b4982ac89 Roll back optimizations to lldrawpoolalpha causing emissive strangeness and alpha materials lighting errors. 2019-03-04 10:31:55 -08:00
Graham Linden 552267f1c9 Fix unused local var 'partition' and avoid assert in rendering highlights. 2019-03-04 09:50:11 -08:00
Graham Linden 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
Graham Linden 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
Graham Linden d90b16d350 Merge 2019-03-02 07:18:17 -08:00
Graham Linden d8eff424a5 SL-10664 2019-03-02 07:17:46 -08:00
Rider Linden 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
Graham Linden bf8dee73f9 Merge 6.1.1 2019-02-28 18:28:13 -08:00