2508926569
SL-16014 Add Tracy logging to lldrawpoolavatar.cpp
2021-09-22 14:38:42 -07:00
7fe2856516
SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled.
2021-09-15 12:41:38 -06:00
7199ce4514
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
...
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef
2021-05-26 10:57:39 -06:00
ba8dcf906d
Merge branch 'master' into DRTVWR-515-maint
2021-02-17 21:20:08 +02:00
5691d302ef
SL-12069 Issues with bakes-on-mesh and alpha modes
2020-12-10 23:17:07 +02:00
e3de5de3c1
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-11-13 13:59:36 +00:00
c79e648aac
SL-14015 - possible fix for phantom animesh attachments on mac
2020-11-04 16:07:10 +00:00
caea7260c7
SL-14142 - impostor management cleanup
2020-10-20 18:56:44 +01:00
9618df484b
SL-14130 Jellydolls have wrong appearance when non-impostors is uncapped
2020-10-16 23:16:04 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
376f690f8f
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-09-28 19:51:24 +01:00
1cba874abf
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-09-23 20:20:27 +01:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
1049f15c9c
SL-13541 - don't show shadow of invisible avatars
2020-09-09 15:36:41 +01:00
a9ddf20ff2
SL-13611 - make sure impostor gets drawn for initially jellydolled avatars
2020-07-22 17:49:45 +01:00
9751942372
Small Cleanup
2020-05-18 18:33:08 +03:00
553e4e5582
SL-12014 fixed wrong pool type check
2020-05-14 11:28:16 +03:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
4e75814b44
Merge remote-tracking branch 'origin/master' into SL-12995
...
Merge
2020-04-22 15:34:58 +01:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
5c7e91f62f
SL-12996 - replace checks of VisualMuteSettings with OverallAppearance
2020-04-08 14:40:01 +01:00
764cb89892
SL-12824 Imported fix for crash
...
For "Face with no texture index references indexed texture draw info"
2020-03-27 16:36:31 +02:00
3b7a89322e
SL-1130 Reverted part of d9dc1e2
2019-11-29 18:21:21 +02:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
6f4692bac2
SL-1130 Fixed crash in LLRender::loadMatrix()
2019-10-22 17:56:12 +03:00
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
58f7b981bd
SL-11337
...
Fix handling of ambient (was getting reset to 1,1,1,1 unintentionally).
Modify shaders to balance ambient across render modes again.
2019-05-31 13:47:44 -07:00
e4bac71ac3
Fix shader link fail from forward decl of wrong soft clip func in class 1.
...
Fix trying to bind diffuse maps for shader without uniform in shadow shaders.
Clean up merge fail around mShaderLevel namechange.
2019-04-02 14:14:19 -07:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07: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
4c3050a395
SL-10664, SL-10666
...
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.
Baseline for performance work.
2019-03-03 10:42:19 -08:00
c1d2416826
EEP performance WIP
...
Mods to improve alpha obj render performance.
Removes hacky fix for HUD elements getting atmospherics.
Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding.
Fix up default classes and basic shader loading (remove unused shared modules).
2019-02-28 14:06:19 -08: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
c909e496fd
SL-10501
...
Remove assert and replace with warning when rigged mesh tries to use tex anim on tex index > 1.
2019-02-08 12:43:27 -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
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
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
c21396181b
Merged in lindenlab/viewer-release
2018-11-14 22:47:31 +02:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
aacb7eb25f
SL-9773 - treat animated object attachments the same as other rigged attachments for purposes of visibility in mouselook.
2018-10-01 16:11:09 +01:00
00fe3e06e2
SL-6613 more fine-tuning of the logic around rigged alpha shadows to avoid issues when a diffuse texture with alpha is used with non-blended material diffuse alpha modes
2018-09-24 16:57:31 +01:00
53abfe53bd
SL-1835
...
Make attachmentAlphaMaskShadow frag shader ignore vert alpha which can be incorrect.
Make discard test in attachmentAlphaMaskShadow match other shadow shaders more closely.
Fix highlightF shader compile error.
2018-09-18 17:53:35 +01: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
50f6504d75
MAINT-9046 honor alpha mode none even when texture has alpha channel when checking state in avatar attachment shadow passes
2018-08-25 00:26:26 +01:00
b066310231
MAINT-9024 MAINT-9025 fix shadow render of materials objects to use alpha and don't draw MATERIAL_ALPHA content twice in shadow pass
2018-08-21 18:24:08 +01: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
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
ef264fd82e
SL-838 - more checking of pool state when adding or removing rigged meshes
2017-12-08 15:42:29 +00:00
5cbe057880
SL-838 - prevent deletion of LLDrawPoolAvatar while it still has rigged faces
2017-12-08 15:20:28 +00:00
Ptolemy