Commit Graph

177 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Graham Linden bdf4442e21 Add missing new shader files. 2018-11-09 22:55:41 +00:00
Graham Linden d614bf1135 Yes, Maurice, baby steps. 2018-11-09 21:11:37 +00:00
Graham Linden db270df7cc Back out changes causing broken shadows and other render shenanigans. 2018-11-09 18:31:29 +00:00
Graham Linden 2929998982 Move to using a shared deferredUtil object for getting pos/norm from gbuffer.
Eliminate 20+ callsites with copy-paste of getPosition and/or getNorm code.

Make pipeline use getShadowTarget/releaseShadowTarget consistently.
2018-11-06 19:33:04 +00:00
Graham Linden fb335cc243 SL-10000 fix storing of ambient value when converting legacy settings 2018-11-01 18:26:24 +01:00
Graham Linden 536799d07e SL-9977
SL-9973
2018-10-29 23:02:20 +01:00
Graham Linden 79d33f9d19 Fix names of WATER_BLUR_MULTIPILER.
Give wave direction uniforms more meaningful names in shaders.

Add comments on glow size/focus conversions for clarity.
2018-10-10 18:44:03 +01:00
Graham Linden f8aac19237 SL-1289
add cloud_variance control for randomized perturbance of clouds to break up tiling monotony
2018-10-09 18:44:43 +01:00
Graham Linden ffc6393309 SL-9751
Add optional moon brightness setting
2018-10-08 22:08:35 +01:00
Graham Linden 5eed233618 SL-1925
More settings for rainbow/halo atmospheric effects, final default asset UUIDs, and shader mods.
2018-10-05 21:32:42 +01:00
Graham Linden 1df7760d31 SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
Graham Linden 3237923e10 MAINT-3699 new shaders supporting alpha blend/mask rigged content.
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
2018-08-16 00:31:39 +01:00
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
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 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
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
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 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
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
Rider Linden e97c52bdd3 Rename uniform "sunlight_color_copy" to sunlight_color in shader. 2017-10-04 14:36:41 -07:00
Rider Linden 0d414c1fb5 Clouds still funky but better. 2017-09-26 09:19:20 -07:00
ruslantproductengine 0e9fb587fa MAINT-7813 - 3D rendering broken on Windows in build 508618. 3D rendering starts before 2D login screen is cleared.
FIXED
2017-09-18 21:02:53 +03:00
Oz Linden 6883c6b1f6 replace a 'continue' with an 'else' 2017-09-14 16:56:51 -04:00
ruslantproductengine 46dc097516 MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac viewer
FIXED
2017-09-14 16:39:01 +03:00
ruslantproductengine eebbda288d Backed out changeset: 5fe5ad059c05 2016-07-18 20:09:18 +03:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
ruslantproductengine 1b5af4be29 Add invert texture coordinates for media textures. 2016-05-13 18:47:23 +03:00
Oz Linden 511bf30a2e make shader loading messages LL_DEBUGS 2016-03-07 15:40:39 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden b66c719060 merge changes for 3.7.20-release 2014-11-10 14:43:05 -05:00
Oz Linden 7ffa456683 STORM-2080: correct fitted mesh rendering on some ATI cards 2014-10-14 11:22:39 -04:00
Dave Parks d0428575fb Automated merge with http://bitbucket.org/lindenlab/viewer-release 2014-06-19 13:14:42 -05:00
Dave Parks 24f8745914 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden) f86a7c04d3 NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues 2013-07-30 11:33:58 -07:00
Graham Madarasz (Graham Linden) b44e7303d8 NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac 2013-07-29 18:59:45 -07:00
Graham Linden f357269c38 NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place 2013-07-25 09:36:13 -07:00
Graham Linden e290dd3fa1 NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects) 2013-07-24 04:03:27 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Dave Parks 743d1a777e NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Dave Parks 933d4c40f4 NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies. 2013-05-23 12:47:52 -05:00
simon b864cecd6c De-bork the viewer merge, causing black in-world images. Reviewed by Kelly 2013-05-13 16:34:52 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz 1688e995eb Provide LLGLSLShader backwards compat so as not to break the appearance utility 2013-04-26 09:11:52 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Geenz cfc3757778 First pass on alpha blended materials 2013-04-11 14:57:11 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Geenz 2ae4b6976b Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state. 2013-02-04 11:32:05 -05:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Geenz eda11a25a4 Initial (largely complete) gamma correct rendering implementation. 2013-01-11 06:37:21 -05:00
Jonathan Goodman d5b45b0b63 Use an unordered map for custom #defines instead of a map. Lookups are faster, and we don't really care about any particular order anyways for these. 2012-08-29 08:02:46 -04:00
Jonathan Goodman c911efb953 Just pass in an empty preprocessor definition map from now on. The shader compiler won't add new #defines if it's empty. 2012-08-29 03:41:26 -04:00
Jonathan Goodman ed1b78e322 Added support for adding custom preprocessor definitions (for shader permutations) 2012-08-28 10:33:32 -04:00
Dave Parks e86b1c18db MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Dave Parks 28ccf4190e MAINT-653 Fix for shadow acne at high altitudes 2012-06-22 17:31:46 -05:00
Dave Parks abaf0155b4 MAINT-616 Faster issuance of occlusion queries. 2012-05-25 10:51:38 -05:00
Adam Moss 9ce481a5ac STORM-1819: Ternary/graded shadow support
Coalesced patchset.
2012-04-21 17:35:50 +01:00
Dave Parks 353907bac6 SH-2908 Fix for incompatibility issue with GLSL 1.30 2012-02-28 16:10:04 -06:00
Dave Parks 8f261582b8 SH-2908 Fix for crash when enabling Lighting and Shadows on some AMD GPUs 2012-02-22 14:30:24 -06:00
Dave Parks e1a71a97cd SH-2908 Potential fix for pink textures on some OpenGL 3.1 implementations. 2012-02-21 14:02:09 -06:00
Dave Parks 8d12038ef6 SH-2908 Potential fix for precision complaints from some AMD OpenGL 3.1 implementations. 2012-02-17 15:06:48 -06:00
Dave Parks 76a27f5100 SH-2964 Fix for shader compilation error on some older NVIDIA cards. 2012-02-13 13:55:51 -06:00
Dave Parks 3710c6110d SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations. 2012-02-10 20:04:19 -06:00
Dave Parks 38e0b7de96 SH-2729 Fix for horizontal line of glitching graphics when DoF enabled 2012-02-06 18:56:19 -06:00
Leslie Linden 71a660e006 * Fixed up shader compilation errors to get lighting and shadows working again on Mac.
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.

Reviewed by davep.
2012-01-26 10:17:41 -08:00
Dave Parks 9fa68f0da3 SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
Dave Parks 2dc7df91ad SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-13 15:23:55 -06:00
Leslie Linden 06a2d4eb27 SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason. 2011-11-28 17:13:42 -08:00
Dave Parks 5c690db63f SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future. 2011-11-18 15:04:26 -06:00
Dave Parks bbac7e9aec SH-2681 Fix for shader compiler error on GLSL 1.30 and later 2011-11-15 13:01:23 -06:00
Dave Parks df546bfba9 SH-2666 Tweak depth of field optimizations based on resident feedback. 2011-11-10 16:12:50 -06:00
Dave Parks c8f558f677 SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter. 2011-11-10 11:39:08 -06:00
Dave Parks 367d6212ae SH-2652 Better DoF combine foo 2011-11-04 17:07:40 -05:00
Dave Parks 2179e1c1f2 SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway. 2011-11-02 13:13:38 -05:00
Dave Parks b58229a64e SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders. 2011-11-01 14:33:20 -05:00
Dave Parks 973e99622e SH-2240 Make OSX never attempt to use GLSL 1.30 or later 2011-10-21 11:05:49 -05:00
Dave Parks 3211c6e308 SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state 2011-10-11 00:26:03 -05:00