Commit Graph

1086 Commits (0ff65651cc219eef959c5e961663de2a07595e5a)

Author SHA1 Message Date
Graham Linden 71a0d3e959 Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.

Fix OSX 10.14 SDK compile issue from unused var in scroll list.
2018-06-26 23:31:03 +01:00
Graham Linden 34865c4bb5 Mods to hook up water settings to water normals for rendering with support for current to next blending.
Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings.

Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-13 00:51:39 +01:00
Graham Linden 67ab0084f8 Fix env panel forward action.
Make env panel update environment when jumping frame to frame.

Add separate funcs for sun/moon vectors in various coord systems.

Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
Graham Linden fc8d0de673 Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture. 2018-06-11 22:39:57 +01:00
Graham Linden a0598b1265 Fix water fog consolidation in underwater shaders.
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.

Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01:00
Graham Linden 507c492182 Add specific shader for the moon to allow different rendering at day vs night.
Add MouseMoon positioning ala MouseSun debug setting and accessors to use it.
2018-06-08 22:22:20 +01:00
Graham Linden b6b9094d26 Fix sunlight != sunlight_color_copy and remove hack disable of clouds. 2018-06-05 20:20:43 +01:00
Rider Linden 610a793aa8 EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment 2018-06-05 11:19:22 -07:00
Graham Linden 8cfdc07e79 Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types. 2018-06-01 23:32:30 +01:00
Graham Linden 8dd8501386 Fix mis-merge of LLSettingsBase and remove optimize pragmas. 2018-06-01 15:50:25 +01:00
Graham Linden 37e8fd20c3 Merge to 5.1.6 2018-06-01 15:34:21 +01:00
Graham Linden 64302d3000 Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
Rider Linden bd84cbfa11 Merge 2018-05-31 11:49:27 -07:00
Graham Linden graham@lindenlab.com 439273c9c1 Merge 2018-05-23 01:16:12 +01:00
Rider Linden 3888de9439 Merge 2018-05-22 13:16:37 -07:00
Graham Linden graham@lindenlab.com 190fa8614c Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids. 2018-05-18 23:16:56 +01:00
AndreyL ProductEngine 64b3473f49 Merged in lindenlab/viewer-release 2018-05-18 03:02:44 +03:00
Graham Linden graham@lindenlab.com 3116416fcb Le Merge 2018-05-01 00:10:11 +01:00
Graham Linden graham@lindenlab.com 6dfa720e75 Remove optimize pragmas necessary for working with RWDI in MSVC, but toxic to Clang. 2018-04-20 18:52:41 +01:00
Graham Linden graham@lindenlab.com 0d7fa932d5 Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).

Put in nSight debug support.
2018-04-20 18:14:29 +01:00
Graham Linden graham@lindenlab.com 528ccdc97f Merge 2018-04-18 18:11:25 +01:00
Rider Linden 2fe4b5169f Correct EOL for last line of files. 2018-04-18 09:40:16 -07:00
Graham Linden graham@lindenlab.com 6e6c7ef9a1 Remove constants that are unused as of hooking up external data path. 2018-03-14 00:38:17 +01:00
Graham Linden graham@lindenlab.com 79e4a8c28a Fix up atmospheric helpers and transport shader for adv atmo path.
Basic hook-up of sky settings to llatmosphere model.

Moved mie aniso to be a top-level setting instead of a per-mie-layer setting.
2018-03-14 00:11:19 +01:00
Graham Linden graham@lindenlab.com 4f6682ca29 De-duplicate deferred shader code for atmospherics and transport. 2018-03-12 22:26:22 +01:00
Graham Linden graham@lindenlab.com afa7c1861e Remove optimize pragma. 2018-03-12 17:52:49 +01:00
Graham Linden graham@lindenlab.com 98b2fed85f De-duplicate shader code for encoding and decoding normals to/from gbuffer format. 2018-03-12 17:52:04 +01:00
Graham Linden graham@lindenlab.com cf460b13be De-duplicate sRGB conversion funcs from many shaders
and unify on using the version that works on OSX.

Add more logging to shader loading about fallbacks and loading succcess.

Add frag shaders for sharing sRGB and normal encode/decode via GL shader linkage.
2018-03-12 16:24:16 +01:00
Rider Linden 7b56db31f9 Merge 2018-03-07 11:27:43 -08:00
Graham Linden graham@lindenlab.com 1d522aca8a Reference updated libatmosphere package. 2018-03-06 19:20:52 +00:00
Graham Linden graham@lindenlab.com 7ba03ede49 Modify use of linkable shader from libatmosphere.
Update to use latest 3p-libatmo build packages.
2018-03-06 17:42:54 +00:00
Graham Linden graham@lindenlab.com 5517eb3f6f Remove MSVC pragmas breaking OSX build. 2018-03-03 01:08:58 +00:00
Graham Linden graham@lindenlab.com 98862a53a7 Fix 16F enum for compat w/ SL gl headers on Mac.
Make density profile/layer parsing handle when
LLSD heard you liked arrays so it put an array
in your array.
2018-03-03 00:53:39 +00:00
AndreyL ProductEngine af9069edbf Merged in lindenlab/viewer-release 2018-03-02 00:47:08 +02:00
Graham Linden graham@lindenlab.com 6303ef5763 Redo advanced atmo shader integration with SL. 2018-02-26 16:38:50 +00:00
Graham Linden graham@lindenlab.com 6cc4a091b3 Add settings/validations for new advanced atmo settings. 2018-02-22 00:35:24 +00:00
Graham Linden graham@lindenlab.com 99b82d9449 Atmospherics WIP
libatmosphere integrated in indra/llrender/llatmosphere.cpp

Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
Andrey Kleshchev 4156fb832c MAINT-6363 Normal and specular maps should not be downloaded if ALM is off 2018-03-06 12:59:32 +00:00
andreykproductengine d9064d3a4e MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture. 2018-02-27 15:49:15 +02:00
Graham Linden graham@lindenlab.com 06bce2ddd0 Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
andreykproductengine 8f65593786 MAINT-8146 Clearing pointers 2018-02-13 14:45:09 +02:00
andreykproductengine e394c0623d MAINT-8146 Remade fix with streams to save memory 2018-02-12 19:31:53 +02:00
ruslantproductengine 0f690ab4da Add const 2018-01-30 17:07:27 +02:00
ruslantproductengine 55990724a3 Keep attributes name (useful for debug) 2018-01-30 17:07:00 +02:00
Andrey Kleshchev 6e445e82e2 MAINT-8091 Removed deprecated and unused private memory pooling 2018-01-30 14:03:26 +00:00
AndreyL ProductEngine 15c62d9e71 Merged in lindenlab/viewer-bear 2018-01-17 03:58:24 +02:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00
andreykproductengine 56c878925a MAINT-7003 Crash in LLVBOPool
Error to help figuring out if error happens due to gl or memory issue
2018-01-12 18:54:20 +02:00
AndreyL ProductEngine 7d156389e4 MAINT-8043 Fix for bad_alloc crash in LLImageGL::setImage() 2017-12-18 20:29:50 +02:00
andreykproductengine 1f56b223d7 MAINT-8101 Added sanity check to confirm crash location 2017-12-18 15:15:54 +02:00