ddfb4a5d1b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 14:30:18 +02:00
2057fa9716
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 18:10:48 +01:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
a5aac89809
SL-14035: Don't use sRGB textures when not specified
2021-01-06 18:17:56 -08:00
4d9ef8e06b
BUG-228586 and related. Colour space fixes to address specularity issues
...
This is effectively just completing the reversion of the gamma changes made by LL then partially backed out. (from Rye)
2020-12-28 11:58:55 +00:00
caf7f6c1d2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:53:39 +01:00
e4d6a76486
Add one more check
2020-10-18 15:19:32 +02:00
16c14ea4cb
Don't exceed the supported line width
2020-10-18 02:21:58 +02:00
ac94268e5e
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
2020-10-18 02:21:58 +02:00
7d107d3954
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 11:34:41 +02:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
760dd9615c
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-08-06 10:44:57 +02:00
92ee1be5cf
SL-13521, clang-format LLRender::syncLightState() (whitespace)
2020-08-05 12:30:24 -06:00
8b314a646f
SL-13521, stamp out some remaining hard-coded 8s
2020-08-05 12:05:23 -06:00
107a7fec34
SL-13521 add an avatar appearance light to deferred mode
2020-08-04 17:14:19 -06:00
3d37c73654
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-06-17 12:10:58 +02:00
84d3065596
SL-13281, add missing srgb->linear conversion for specular
2020-06-11 23:33:14 +03:00
fff65c73fd
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-04-23 19:05:35 +02:00
024c357eb1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 18:55:47 +02:00
abe5cc5787
Fix for 'release' configuration
...
llassert is not used in 'release' configuration and build fails due to unused tex_index
2020-04-21 10:32:45 +03:00
278853824d
Fixed merge conflict and restored SL-1130
2020-04-20 21:56:21 +03:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
3d22273726
Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF
2020-03-24 11:22:01 -05:00
fcdb198a62
Merge viewer-cougar
2019-12-13 17:15:37 +01:00
74904f39e1
SL-1130 Prevent crash on mMatrix
2019-11-29 18:31:50 +02:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
95baae0235
Merge viewer-eep
2019-05-09 18:48:19 +02:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
a1e8042c1f
SL-11055, SL-10966, SL-11087
...
Make haze look more like WL.
Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
2019-05-07 15:36:43 -07: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
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
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
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
57d88a8a98
Gamma correction pass 2:
...
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights. Frees up a pow and some multiplies on the CPU every frame.
2019-03-29 08:11:56 -07:00
446afe2d1a
Make whether the sun or moon is primary part of llrender light state so we can set uniforms for shaders along with other light params.
...
Fix atten calcs to not use abs val.
2019-03-26 08:21:53 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
772924252b
Merge viewer-eep
2019-02-28 23:38:39 +01:00
788a108384
SL-10501
...
Fix broken matrix management code causing modelview mats to be used as tex anim mats
(do not depend on default matrix mode already being set).
Give the deferred terrain shader a name.
Make LLRender use the eMatrixMode enum instead of ints.
2019-02-21 16:03:46 -08:00
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01:00
0a7bc35335
Replace funcs dropped in merge.
2019-02-08 13:19:45 -08:00
90f9078d1f
SL-10486, SL-10501, SL-10487
...
Make moon texture from default daycycle the default moon texture id and use it for the default and blank assets in the picker.
Fix handling of MM_TEXTURE to correctly detect when texture units outside the range 0-3
are used with texture matrix ops to prevent mem overwrite bug and/or asserts.
2019-02-07 16:00:21 -08:00
9a007cceef
SL-10461
...
Pass projector ambiance as the .w element of the light_attenuation uniform
so that alpha shader can emulate the behavior of proper spot projectors.
2019-02-04 12:56:11 -08:00
a10ec81e82
SL-10743, SL-10744
...
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.
Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
Ansariel