8a44c58dee
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-04-02 22:53:28 +02:00
d357bf7ae5
SL-14990 Turn on shader init logging after crash
2021-04-01 19:44:56 +03:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
d43b8d8551
SL-13019: Add debug logging of shaders used to track down macOSX / OSX GLSL linker errors
2020-04-15 15:54:38 -07:00
a387b38d20
Cleanup to coding standard
2020-04-15 15:54:38 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
230c9b68d8
Remove binding and use of glIsShader for now (only useful for avoiding warnings about deleting shader objects re-used across programs).
2019-07-22 16:24:49 -07:00
b346624307
SL-10761
...
Make vograss objects set their face vert/index counts to 0 when setting
the number of blades to 0 to disable rendering so we don't allocate space
and then skip setting it up with actual index data in getGeometry.
2019-07-22 15:44:35 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
08812cbe06
Separate out vertex program objects from fragment program objects and use it.
...
Given that mShaderObjects only ever expects one copy of a given shader object (leading to lots of "shaderV" and "shaderF"), it made having utility shaders a bit more difficult to incorporate.
This change makes sure the two are separated. Using this over a multimap largely for readibility.
Also, actually, you know, use this functionality.
--HG--
branch : OPEN-340
2019-04-10 02:11:07 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01:00
acbc7f4cdd
SL-10415, SL-10434
...
Further tweaking of directional shadow sampling to balance between peter-panning and shadow acne.
Move stars to just this side of the sky some to reduce parallax.
Remove decodeNormF and uses of decode_normal in favor of unified use of getNorm
(try to help the Intel HD x000 compiler learn to link correctly).
2019-01-30 08:37:07 -08:00
acb6fda901
Merge viewer-eep
2019-01-26 00:02:49 +01:00
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
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
15270f697a
Tab restoration project.
...
'warn-on-failure:no-tabs'
2019-03-12 10:52:00 -07:00
53f3755a46
Fix tabs.
2019-03-07 15:09:34 -08:00
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
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
a49e2b604e
SL-10044 SL-10045
...
Fix class 1 and 2 transport/gamma funcs and made usage consistent across all shaders.
Fix class1\environment\waterV reverting to old d1/d2 names for wave directions.
2018-11-12 15:54:53 -08: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
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
2e55eae9cc
Merge and fix MAINT-9087 and MAINT-9084
2018-09-04 23:08:20 +01:00
6dd9dd3ab6
MAINT-9064
...
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
2018-08-30 17:54:59 +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
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
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
bd84cbfa11
Merge
2018-05-31 11:49:27 -07: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
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
5517eb3f6f
Remove MSVC pragmas breaking OSX build.
2018-03-03 01:08:58 +00:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
6303ef5763
Redo advanced atmo shader integration with SL.
2018-02-26 16:38:50 +00: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
55990724a3
Keep attributes name (useful for debug)
2018-01-30 17:07:00 +02:00
df376c0299
MAINT-6437 - Tile-Based Texture Animation Scales Incorrectly for Rigged Mesh when worn (MacOS only)
...
FIXED.
2017-12-26 18:20:06 +02:00
547df251e4
Merge viewer64
2017-10-02 17:57:56 +02:00
0d414c1fb5
Clouds still funky but better.
2017-09-26 09:19:20 -07:00
5d3599f5d1
Merge
2017-09-22 09:18:34 -07:00
d4d0520f38
Cleanup inside GLSLShader for uniform mapping.
2017-09-20 14:29:36 -07:00
Ansariel