218e719d24
Merge viewer-eep
2018-12-13 21:14:20 +01:00
7e9033821a
De-duplicate deferred gbuffer access for getPosition/getNorm.
...
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl
Split shared shadow tap funcs into shadowUtil.glsl
2018-12-06 10:59:11 -08:00
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01:00
bdf4442e21
Add missing new shader files.
2018-11-09 22:55:41 +00:00
d614bf1135
Yes, Maurice, baby steps.
2018-11-09 21:11:37 +00:00
db270df7cc
Back out changes causing broken shadows and other render shenanigans.
2018-11-09 18:31:29 +00:00
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
fb335cc243
SL-10000 fix storing of ambient value when converting legacy settings
2018-11-01 18:26:24 +01:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
83b514a46f
Merge viewer-eep
2018-10-24 22:57:18 +02:00
429bef3cf6
Remove compilation and linkage of deferredUtil and indirect GLSL helper objects (current source of Intel ig4icd driver crash).
2018-11-15 08:11:05 -08:00
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
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
ffc6393309
SL-9751
...
Add optional moon brightness setting
2018-10-08 22:08:35 +01:00
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
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
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
8ab2169efb
Merge viewer-cougar
2018-08-22 10:15:24 +02:00
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
565d5f7611
Added @setsphere modifiers and exposed them as shader uniforms
...
--HG--
branch : RLVa
2018-06-30 15:15:29 +02:00
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
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
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
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
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
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
b6b9094d26
Fix sunlight != sunlight_color_copy and remove hack disable of clouds.
2018-06-05 20:20:43 +01:00
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
8dd8501386
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
2018-06-01 15:50:25 +01:00
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
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
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
6dfa720e75
Remove optimize pragmas necessary for working with RWDI in MSVC, but toxic to Clang.
2018-04-20 18:52:41 +01:00
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
fd38970f23
Added vision spheres using a post-processing shader (PoC)
...
--HG--
branch : RLVa
2018-04-07 16:19:11 +02:00
4f6682ca29
De-duplicate deferred shader code for atmospherics and transport.
2018-03-12 22:26:22 +01:00
afa7c1861e
Remove optimize pragma.
2018-03-12 17:52:49 +01:00
98b2fed85f
De-duplicate shader code for encoding and decoding normals to/from gbuffer format.
2018-03-12 17:52:04 +01:00
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
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
e97c52bdd3
Rename uniform "sunlight_color_copy" to sunlight_color in shader.
2017-10-04 14:36:41 -07:00
547df251e4
Merge viewer64
2017-10-02 17:57:56 +02:00
bbb003a9fa
Backed out changeset 740d3937e83c (Fix for FIRE-20305) to make room for LL fix
2017-10-02 17:52:36 +02:00
0d414c1fb5
Clouds still funky but better.
2017-09-26 09:19:20 -07:00
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
6883c6b1f6
replace a 'continue' with an 'else'
2017-09-14 16:56:51 -04:00
46dc097516
MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac viewer
...
FIXED
2017-09-14 16:39:01 +03:00
11b7af0c2a
FIRE-20305: Fix GLSL compatibility in shaders, by Drake Arconis (Alchemy Viewer)
2016-11-29 15:00:27 +01:00
b547aeef03
Merge with https://bitbucket.org/lindenlab/viewer-vlc
2016-08-01 16:15:47 +02:00
eebbda288d
Backed out changeset: 5fe5ad059c05
2016-07-18 20:09:18 +03:00
e982c273fd
Merge with viewer-release-vlc
2016-05-29 19:27:00 +02:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
1b5af4be29
Add invert texture coordinates for media textures.
2016-05-13 18:47:23 +03:00
63c895fe62
Merge viewer-quickgraphics
2016-03-10 08:50:20 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
511bf30a2e
make shader loading messages LL_DEBUGS
2016-03-07 15:40:39 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
b66c719060
merge changes for 3.7.20-release
2014-11-10 14:43:05 -05:00
1ee6b83b10
Proper fix for intel shder compiler log spam.
2015-02-26 09:58:34 -08:00
37d47ffbf0
Fix intel GLSL compiler spitting out "No errors." instead of an empty string like others do when there are no errors, causing log spam.
2015-02-25 23:54:22 -08:00
99cbf150a0
Merge LL V3.7.21
2015-01-15 13:55:17 +01:00
992ebe2c63
Remove Nicky's AMD fix - will be replaced by the V3 version
2015-01-15 13:16:21 +01:00
93c0ece928
Merge LL v3.7.20
2015-01-15 01:17:02 -08:00
7ffa456683
STORM-2080: correct fitted mesh rendering on some ATI cards
2014-10-14 11:22:39 -04:00
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
24f8745914
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
72faa660f7
Remove old AMD/ATI fix for pink. It is for driver that predate 2009-12, with something as old as that, there will be a lot more issues than just pink textures.
2014-04-06 18:22:28 +02:00
c2fbeae724
FIRE-12968/FIRE-12929; Fix crash for AMD driver and random rendering artifacts.
2014-03-10 00:00:49 +01:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
e290dd3fa1
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
2013-07-24 04:03:27 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
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
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
933d4c40f4
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
2013-05-23 12:47:52 -05:00
b864cecd6c
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
2013-05-13 16:34:52 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
cfc3757778
First pass on alpha blended materials
2013-04-11 14:57:11 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
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
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
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
e551fc5137
Merge LGPL
2013-09-29 20:35:40 -07:00
9810792665
Back out Intel HD 4000 fixes to thoroughly test the latest driver with OGL 4.2 support
...
This driver seems to have fixed the rendering issues.
2013-09-29 16:14:57 -07:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
0c314a0e6f
Merge LGPL
2013-09-21 16:59:50 -07:00
Ansariel