Commit Graph

40616 Commits (d7789999cb6bab7b4e28236d99c4c2a8006497ff)

Author SHA1 Message Date
maxim_productengine d7789999cb SL-10897 FIXED [EEP] Sliding a keyframe will not prompt to save changes before closing the window. 2019-04-05 17:05:01 +03:00
Rider Linden 6d756c5337 Merge 2019-04-04 11:48:03 -07:00
Rider Linden dfdeeb353c SL-10849: Select the correct notification for unchecking the parcel owners may override button. 2019-04-04 11:47:28 -07:00
Rider Linden e4c281c134 Merged in graham_linden/viewer-eep-fixes (pull request #336)
SL-10887
2019-04-04 17:30:11 +00:00
Graham Linden bfd2a594d7 SL-10887
Disable occlusion culling when rendering water reflection/refraction maps again (still getting probabalistic results for reflection map contents). :/
2019-04-04 10:27:43 -07:00
Rider Linden 7703ae3b1b Merged in graham_linden/viewer-eep-fixes (pull request #335)
SL-10886
2019-04-04 17:05:02 +00:00
Graham Linden 4ba6e05469 SL-10886
Render sun/moon beacons in non-ALM mode too.
2019-04-04 09:58:04 -07:00
maxim_productengine 64942c5cd1 SL-10875 FIXED [EEP] Selecting the Day Cycle window causes the previous keyframe to become selected if keyframes are close together 2019-04-04 18:09:23 +03:00
Rider Linden 2151bc797e Merged in Geenz/viewer-eep-shader-fixes/BUG-226620 (pull request #333)
Fix for BUG-226620

Approved-by: Graham Madarasz <graham@lindenlab.com>
2019-04-03 23:11:07 +00:00
Geenz 2013578ca9 Update contributions.
--HG--
branch : BUG-226620
2019-04-03 16:07:39 -07:00
Geenz a615dc049e Bring back specular bloom.
--HG--
branch : BUG-226620
2019-04-03 16:01:12 -07:00
Geenz 0e9193d84c Make sure that the SL BRDF is being applied to objects lit by the sun and moon.
Fixes BUG-226620

--HG--
branch : BUG-226620
2019-04-03 15:51:20 -07:00
Rider Linden 28fd43a161 OSX hates unused variables 2019-04-03 15:48:52 -07:00
Rider Linden 51cd9e7ddc Merged in graham_linden/viewer-eep-fixes (pull request #332)
SL-10856
2019-04-03 22:42:40 +00:00
Graham Linden a5d4edaccc SL-10856
Make terrain *not* blend all the way to diffuse color for no reason.
2019-04-03 15:20:52 -07:00
Rider Linden 8f1e75071e Merge 2019-04-03 14:53:49 -07:00
Rider Linden e24237b6af SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications. 2019-04-03 14:52:59 -07:00
Graham Linden 82fbf64261 Add shader unloads for new deferred avatar/attachment alpha/mask shadow shaders. 2019-04-03 12:35:51 -07:00
Graham Linden a698b51681 Replace MAINT-8836 fix dropped in merge of 6.1.2 2019-04-03 12:07:59 -07:00
Graham Linden 98f71bb8e4 Replace dropped code from 6.1.2 for loading new avatar/attachment alpha/mask shadow shaders. 2019-04-03 12:01:34 -07:00
Graham Linden ed12bb1c77 Remove unused iterator for Xcode 10.2 happiness. 2019-04-03 09:58:46 -07:00
Graham Linden 07f380d61a Fix random Xcode 10.2 failures from unused vars and references to local objects.
Modified llwindowmacosx to pass some things by value instead.
2019-04-03 08:47:44 -07:00
Graham Linden 7d757e9cda SL-10876
Fix edge cases in determining when we can skip doing shadow rendering work.
2019-04-03 08:10:23 -07:00
Graham Linden 4170f7b160 SL-10855
Apply sRGB colorspace to deferred cloud output.
2019-04-02 17:26:16 -07:00
Graham Linden f89490c1de Add attributions. 2019-04-02 17:03:35 -07:00
Graham Linden 4a0f3db9a4 SL-10857
Juggle forced frag depths for moon/sun/stars/sky to get depth fighting with distant terrain...wait for it...sorted.
2019-04-02 16:21:51 -07:00
Graham Linden 02a4740c1b SL-10853
Fix windlight shader level selection.
2019-04-02 15:49:26 -07:00
Graham Linden accd83cc7e Fix missing EOL on last line. 2019-04-02 14:42:06 -07:00
Graham Linden e4bac71ac3 Fix shader link fail from forward decl of wrong soft clip func in class 1.
Fix trying to bind diffuse maps for shader without uniform in shadow shaders.

Clean up merge fail around mShaderLevel namechange.
2019-04-02 14:14:19 -07:00
Graham Linden d78ed764b5 Merge 6.1.2 LoveMeRender new hotness 2019-04-02 12:27:34 -07:00
Nat Goodspeed 5cf18cb867 increment viewer version to 6.1.2 2019-04-02 14:34:12 -04:00
Nat Goodspeed a3f4405cba Added tag 6.1.1-release for changeset 50f0ece62ddb 2019-04-02 14:34:12 -04:00
Rider Linden 14629ca3d6 Merged in Geenz/viewer-eep-shader-fixes (pull request #322)
Water plane rendering improvements

Approved-by: Graham Madarasz <graham@lindenlab.com>
2019-04-02 18:07:08 +00:00
Rider Linden d7b47bf71f Merged in Geenz/viewer-eep (pull request #321)
[WIP] Use EXT_texture_sRGB_decode in order to selectively sample textures consumed by the deferred renderer as sRGB

Approved-by: Graham Madarasz <graham@lindenlab.com>
2019-04-02 18:06:37 +00:00
Graham Linden 1199d13981 Remove pragma for turning off optimization for debugging. 2019-04-02 09:30:56 -07:00
Graham Linden f3d04dfa1e Roll back KDU to 7.a.4 version instead of updating to 7.a.7 2019-04-02 09:28:42 -07:00
Graham Linden 5be000f566 Fix mismerge of autobuild leading to MD5 sum check fail for M64 build. 2019-04-02 08:47:03 -07:00
Geenz f07a1741e9 Make sure emissive is actually handled with atmospherics consistently. 2019-04-02 01:28:57 -07:00
Geenz 6b54c48dff Scale the specular contribution to account for brighter highlights.
This is more or less to achieve the non-ALM bloom behavior in most circumstances.
Why scale it?  Normalized blinn-phong gets brighter the higher the specular exponent.  As it stood, the old spec contribution was extremely bright despite looking "correct".  This is largely eyeballed, but generally looks better for all light sources applied to the surface of the water.
2019-04-01 23:25:48 -07:00
Geenz 558eaef3ea Make sure that atmospheric calcs aren't done twice.
The atomospherics were being applied both in the G-buffer and during the sun light pass.  This ensures that is not the case.
Additionally, re-enable specular on the water plane, scale the bloom factor to something more reasonable, and also someone broke specular on emissive surfaces.  That's fixed too now.
2019-04-01 23:09:43 -07:00
Geenz 3a42d2b94a Whoops! Always make sure that our primary format is assigned. 2019-04-01 18:51:28 -07:00
Geenz 0e47ca896d Make LLImageGL's loading of assets as sRGB or linear conditional based upon sRGB decode support. 2019-04-01 18:34:56 -07:00
Geenz 233f3310aa Whoops, forgot a shader! 2019-04-01 12:12:33 -07:00
Geenz 9d03722479 Make sure the specular and diffuse buffers are being sampled in sRGB space. 2019-03-30 17:47:08 -07:00
Geenz a158c87957 Hide sRGB decode behind a flag, and make sure that sRGB decodes is strictly opt-in. 2019-03-30 17:22:54 -07:00
Geenz 2513aa0ed1 Additional gamma correction work: start moving over to EXT_texture_sRGB_decode. 2019-03-30 03:18:02 -07:00
Graham Linden 9b34751614 Merge 2019-03-29 16:03:03 -07:00
Graham Linden 15c911d3e6 SL-10566
Enable RenderAlphaBatchEmissives by default to get some perf back.
2019-03-29 16:01:13 -07:00
Rider Linden 47e3c3aa21 BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad 2019-03-29 15:57:22 -07:00
Graham Linden cb7d07e0ca SL-10844, SL-10584
Add Geenz doings to the contribs list.

Fix per-frag atmospherics to use sRGB conversion.

Update ref to new KDU package.
2019-03-29 15:56:59 -07:00