6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
beae4564e3
SL-17584 Make setShaders crashes more informative
2022-06-15 16:00:21 +03:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
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
c8286c2403
Merge branch 'rlva/development'
2021-02-13 13:56:46 +01:00
0e02c0d197
Merge branch 'rlva/feature/effect-sphere' into rlva/develpment
2021-01-10 23:37:10 +01:00
35564009af
Merge branch 'rlva/feature/effect-sphere' into rlva/development
2021-01-06 16:28:42 +01:00
22a5734051
A clever bunny noticed that other commands use dist[min|max] rather than [min|max]dist
2021-01-06 04:36:56 +01:00
db89a4646c
Minor refactoring + add @setsphere_origin to switch between avatar and camera anchoring
2021-01-06 02:24:39 +01:00
626f806fc4
Add a mode parameter to @setsphere and add a blur effect
2021-01-05 23:27:00 +01:00
8e165bc66e
Merge branch 'vision-spheres-hg' into rlva/feature/vision-sphere
2021-01-03 16:43:26 +01:00
c84e015a44
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-07-01 16:08:56 +02:00
2805f38074
DRTVWR-497 Cleanup: Document which enum order comes from
2020-06-29 11:59:52 -07:00
12c68bac09
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-08 08:13:48 +02:00
af7563968c
SL-10449: Put first shader error on new line for readability
2020-04-07 16:22:25 -07:00
e4f72db20d
SL-10449: Add dumping of shader to log file
2020-04-07 16:21:39 -07:00
0b717e2d1a
SL-10449 Cleanup dumping shader without LOG spam on every line when it fails to compile/link
2020-04-07 14:22:24 -07:00
4051f5754a
SL-10449 Fix off-by-one line numbers when dumping shader that failed to compile/link
2020-04-07 14:07:45 -07:00
a329afa6bb
Merge viewer-eep
2019-12-13 18:19:06 +01:00
bd761b0833
Cleanup inconsistent types
2019-11-22 23:41:20 +00:00
18eb8ac90c
QoL fix: remove extra blank lines for every source line when dumping shader source
2019-11-15 15:45:08 -08:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
b507d63566
SL-11621
...
Remove all references to unused shader var global_gamma.
Remove many unused decls for gamma from shaders.
Make post-deferred gamma correction use display_gamma.
Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
2019-07-23 11:36:22 -07:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
16d3279995
SL-10966
...
Fix light atten and transmittance calcs breaking ambient color contrib to fog.
Needs to be tested on DRTSIM-415 or better to get legacy viewer settings that match EEP.
2019-06-03 11:30:41 -07:00
0ec08c1b0f
Merge viewer-eep
2019-05-21 18:22:45 +02:00
fe734ddf07
SL-11056
...
Make OpenGL 3.3 cards not false alarm on version 140 shader reqs.
Makes deferred rendering work on low-end GPUs more often.
2019-05-09 13:14:24 -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
dcd8117b85
First stab at moving atmospheric var calcs to its own utility shader.
...
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good.
--HG--
branch : OPEN-340
2019-04-09 22:35:40 -07:00
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -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
8890c3238a
SL-10478
...
Fix side-effects of having both sun and moon as potential directional light contributors.
We pass an int to the shader indicating which to prefer instead of making per-pixel decisions
and pass the moonlight color/di independently.
Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
2019-02-06 16:42:23 -08:00
5a8610ccb7
SL-9996, SL-1130, SL-5546
...
Fix bug with setting texture matrix for rigged mesh.
Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth.
Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning
(we can no longer depend on them being mutex to each other).
2019-02-01 13:41:31 -08:00
deb6110098
Eliminate helper GLSL modules depending on further GLSL modules to give Intel HD x000 compiler a fighting chance.
...
More WIP for edge-specific water shader for 9996.
2019-01-30 13:26:35 -08:00
08440def11
WIP for 10374 (reduce number of shaders linking against deferredUtil).
...
Prepare for using ifdef to conditionally engage using gl_FragDepth in water shaders
(because GL requires that writing to gl_FragDepth on any path means you need to
write a depth value on every path).
2019-01-30 12:34:20 -08: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
966dc7fc8f
SL-10276
...
SL-9851
Fix cloud shaders to ignore clouds when cloud_scale is 0.
Fix creation of heavenly body geo to avoid degenerate vector math
and not randomly flip orientation when crossing zenith.
Add sun_up_factor to eliminate sun glow around moon when sun is down.
2019-01-24 14:54:11 -08: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
Ansariel