7d4de08fa9
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:49:38 +02:00
e2de27c84e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:38:28 +02:00
fe796dac71
Merge branch 'main' into DRTVWR-588-maint-W
2024-01-08 23:15:00 +02:00
afe91b7eb6
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-08 21:33:06 +02:00
51088cde7f
SL-17896 Don't crash silently if files are missing or out of memory
...
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-01-04 21:13:06 +02:00
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
4b98ae6e8a
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
0db9bcf21f
SL-20279 BugSplat Crash #1327171 : gl_debug_callback(111)
2023-12-13 21:24:08 +01:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
a09b083b1b
Merge branch 'DRTVWR-596' into davep/SL-20611
2023-11-30 12:19:38 -06:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
7706c1771d
SL-20411 Thumbnail textures should have less of an impact on performance #1
...
scale thumbnail textures down to 256 when needed. As we do to chat icons.
# Conflicts:
# indra/newview/llviewertexture.cpp
2023-11-21 22:11:30 +02:00
964f9e74d5
SL-20611 followup -- remove now unused glsl files. Fix transparent water.
2023-11-17 10:10:58 -06:00
bdb53fd56d
SL-20611 Make haze effect local lights -- move sky and water haze to their own passes and unify sky and water haze in forward rendering shaders.
2023-11-16 16:46:12 -06:00
26163e2154
Fix DRTVWR-559 std::array usage in llrender and llprimitive after merge
2023-10-25 16:44:14 -07:00
a29f7c3b4a
SL-20498 Preserve default probe when resetting reflection probes.
2023-10-23 13:54:00 -05:00
bd9c0a2e65
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-10-16 08:48:50 -07:00
e841c73a99
Tons of masking changes and tweaks.
...
We now support masking mirrors in the GBuffer.
We also now support the concept of one arbitrary clip plane.
DRTVWR-583
2023-10-16 08:45:48 -07:00
a91f08ba84
Merge branch 'DRTVWR-559' into DRTVWR-592
2023-10-13 14:02:51 -07:00
754fe9d4b7
DRTVWR-592: (WIP) Triplanar mapping
2023-10-13 10:39:09 -07:00
a7cd5f6ef9
DRTVWR-592: (WIP) (does not run) PBR terrain rendering - more work on shaders, uniforms
2023-10-13 09:57:48 -07:00
7376b3e4b9
DRTVWR-592: (WIP) (does not run) PBR terrain rendering - begin work on shaders, uniforms
2023-10-13 09:57:40 -07:00
c1c5275f20
SL-20411 Thumbnail textures should have less of an impact on performance #1
...
scale thumbnail textures down to 256 when needed. As we do to chat icons.
2023-10-09 19:45:09 +03:00
e7f1466a7b
Merge branch main into DRTVWR-489
2023-10-08 14:01:05 +02:00
878fb36a0b
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorybridge.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llvovolume.cpp
2023-10-03 19:55:49 +03:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
be655fef7f
:x
2023-10-03 14:23:38 +02:00
32bfafca4d
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-09-29 04:34:12 -07:00
a4c2eab969
Fix integer overflow when framebuffers are extremely high resolution resulting in INT_MAX texture bias ( #393 )
2023-09-28 15:05:37 -05:00
73870cb0b4
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-09-25 09:27:49 -07:00
51346ddbb0
SL-20280 BugSplat Crash in LLVertexBuffer::setBuffer()
2023-09-20 18:11:32 +02:00
f01d0dba2b
SL-20279 BugSplat Crash #1327171 : gl_debug_callback(111)
2023-09-15 13:04:09 +02:00
74940194fa
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842
2023-09-11 11:51:20 -05:00
4192cfc1ea
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-09-09 14:52:06 -07:00
8d0af77d0b
SL-19709 Fix for fullbright shiny not factoring out exposure (update)
2023-09-05 16:59:48 +02:00
348d427db6
Add a probe strength uniform for hero probes.
...
On standard reflection probes this doesn't really do anything.
DRTVWR-583
2023-08-29 05:08:47 -07:00
3d73a10da3
Merge branch main (DRTVWR-582) into DRTVWR-567
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
894c9e0417
SL-19842 WIP -- Move sky auto adjustment magic numbers to debug settings.
2023-08-22 13:17:58 -05:00
f4a6a434fa
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-07-31 02:38:13 -07:00
ae63ed51aa
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 ( #292 )
2023-07-18 14:38:18 -07:00
c5d7f3c4c1
DRTVWR-489: trivial merge conflict fix
2023-07-18 10:51:51 -07:00
040050af19
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-07-17 15:06:23 -07:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
acf82867b6
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17 23:34:59 +03:00
07ff9a5d67
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
2023-07-17 23:17:29 +03:00
1fe007abef
SL-20001 EmojiPicker - make the preview to be a panel instead of a button
2023-07-13 22:13:31 +02:00
6628320130
SL-19567: Add option RenderGlowNoise for low precision glow dithering, enabled by default
2023-07-12 15:44:15 -07:00
8b718cbc2e
SL-19831 Check marks in the menu are less visible
2023-07-12 21:50:35 +02:00
d8dd4d9c0c
Just about got hero reflection maps working.
...
DRTVWR-583
2023-06-27 20:01:52 -07:00
ffac2df6ca
Merge branch 'DRTVWR-559' into DRTVWR-583-glossy-ssr
2023-06-11 20:56:02 -07:00
50ec54831d
DRTVWR-559 Revert skies to be very close to release and disable tone mapping when probe ambiance is zero.
...
Hack for desaturating legacy materials has been removed for performance and quality reasons.
Adds a new setting for auto adjusting legacy skies. This is the PBR "opt out" button. If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure. If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.
HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed. If you want relatively even exposure all the time, set HDR Scale to 1.0. If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.
Also tuned up SSAO (thanks Rye!).
Reviewed with Brad.
2023-06-01 19:49:23 -05:00
47e311d6e8
Addressing some performance related feedback with SSR getting drastically slower.
...
DRTVWR-559
DRTVWR-583
2023-05-26 16:56:33 -07:00
0c7205e5f1
SL-19560 Better fix for blurry BoM textures.
2023-05-23 10:55:50 -05:00
b273edd125
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-05-22 10:42:18 -07:00
87bda55268
Add a binary cache for compiled shaders using glProgramBinary ( #216 )
...
* Add a binary cache for compiled shaders using glProgramBinary
* Add additional sanity checking to shader binary save and load, hook up cache clear and menu option
* Fix default init of shader cache data struct and clear gl errors before glGetError calls
---------
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2023-05-17 18:30:27 -05:00
446d0cbf7f
SL-19655 Clean up some missed "texture2D" vs "texture" (thanks Rye)
2023-05-17 18:28:01 -05:00
c827d32ebe
SL-19655 Decruft legacy GLSL shaders and now unused build queues.
2023-05-17 18:09:36 -05:00
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
cdc9852f05
SL-19709 Fix for fullbright shiny not factoring out exposure and flickering fullbright alpha. Incidental decruft.
2023-05-15 11:01:24 -05:00
ad4118f6ce
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-05-11 21:21:01 -07:00
339e02ef33
Finally get glossy SSR up.
...
DRTVWR-583
2023-05-11 21:19:58 -07:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
a3b1d0beb6
SL-19197 Fix for crash in LLRenderTarget::release
2023-04-27 16:05:07 -05:00
88adfdcee4
DRTVWR-559 Add "No Post" mode and refactor "Scene Gamma" into "Brightness" for adjusting legacy gamma when probe ambiance is 0 and dynamic exposure when probe ambiance is not zero.
2023-04-26 20:47:04 -05:00
f4274ba64e
Move mipmap generation into LLRenderTarget.
...
DRTVWR-583
2023-04-14 03:08:28 -07:00
6d5c169716
Merge branch 'DRTVWR-559' into DRTVWR-559-post-refactor
2023-04-12 15:18:27 -07:00
58df456675
Fixed DoF
2023-04-12 14:50:14 -07:00
2b2154f021
SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time.
2023-04-11 15:09:58 -05:00
56b21054eb
Get DoF working
...
Need to fix up bloom.
DRTVWR-559
SL-19524
SL-19513
2023-04-10 11:29:50 -07:00
bb79718c8f
SL-19538 Followup -- scrub all possible sources of NaNs, make dynamic exposure controls not persist, limit exposure range, and do a debug gl pass.
2023-04-06 13:21:25 -05:00
5bf60f5d9e
SL-19538 Followup -- fix for dynamic exposure having large gaps in it… ( #157 )
...
* SL-19538 Followup -- fix for dynamic exposure having large gaps in its luminance sampling.
* SL-19538 Followup -- review feedback changes.
2023-04-05 16:48:34 -05:00
1f79379bf2
SL-19538 Followup -- tune exposure parameters and clamp local light ambiance. Make render targets 16F and scrube NaNs (thanks Rye). Update midday. ( #154 )
2023-04-05 11:55:51 -05:00
d6d634d29f
SL-19331: Move media updates off-thread on select hardware ( #153 )
...
* SL-19331: Have media updates on the LLImageGL thread even when texture updates are on the main thread. Add config.
Off-thread media updates seem work best performance-wise when using glTexImage2D, not sub_image_lines. Otherwise, there are lots of main thread stalls.
* SL-19331: Bump featuretable
* SL-19331: Cleanup, annotate comment
2023-04-05 11:55:33 -05:00
698966f8e7
SL-19538 Remove hacky ambiance scale and take the mittens off probe a… ( #151 )
...
* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values. Fix for sky brightening being done in sRGB space.
2023-04-04 10:29:12 -07:00
28b240fd7f
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-04-03 14:58:58 -07:00
230c96b20d
SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3.
2023-04-03 13:53:18 -04:00
4e306c9066
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
2023-03-31 10:54:22 -07:00
b44ad50f75
Move glow extract to be after tonemapping.
...
SL-19513
2023-03-31 10:54:19 -07:00
81d69cf84d
SL-19379 WIP add worn suffix, use bold font style for worn items and italic for links
2023-03-31 13:40:59 +03:00
198cd4df09
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:09:50 +03:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
7b2205d8f6
Merge branch 'main' into DRTVWR-580-maint-T
2023-03-30 00:39:12 +03:00
10f66c0519
DRTVWR-559 Dynamically adjust exposure.
2023-03-28 14:30:59 -05:00
d1b414e48b
SL-17045 LSL editor cursor position desynchronization
2023-03-24 22:17:36 +01:00
a218eed9a6
SL-19434: Fix texture issues with minimap, but keep performance from SL-19331
2023-03-21 14:28:56 -07:00
7d97008eba
Revert "SL-19434 Temporary fix for minimap breakage."
...
This reverts commit 084ef5173f
2023-03-21 14:27:37 -07:00
275ad3fdab
SL-19266 Potential Use-After-Free in LLImageGL::setImage
2023-03-21 17:04:48 +01:00
084ef5173f
SL-19434 Temporary fix for minimap breakage.
2023-03-21 09:29:44 -05:00
d6dd875ad1
Merge pull request #122 from secondlife/SL-19331
...
SL-19331: Improve performance of setSubImage (ex: media updates)
2023-03-20 07:00:20 -07:00
4319ba5edc
SL-19331: Improve performance of setSubImage (ex: media updates)
2023-03-13 16:47:11 -07:00
e5d80b6000
Merge pull request #119 from secondlife/SL-19389
...
SL-19389: Fix textures not being optimally loaded after the fix in SL-19338
2023-03-13 09:56:10 -07:00
c734602592
SL-19389: Fix textures not being optimally queued after the fix in SL-19338
...
In the future, some uses of glTexSubImage2D should be better vetted, ex: media prims
2023-03-10 17:32:35 -08:00
bd4b03de8b
DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.
2023-03-10 13:33:36 -06:00
2db036ba17
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-03-10 10:53:00 -06:00
25ede86382
SL-19172 Texture streaming tune up. Incidental decruft.
2023-03-10 10:52:35 -06:00
f3eaf390fe
SL-19338: Don't use glTexSubImage2D on compressed textures
2023-03-08 16:57:38 -08:00
3773bac6b4
Revert "SL-19338: (WIP) Test disabling new use of glTexSubImage2D and see if the bug still repros"
...
This reverts commit 6c486e4853
2023-03-08 14:21:44 -08:00
6c486e4853
SL-19338: (WIP) Test disabling new use of glTexSubImage2D and see if the bug still repros
2023-03-08 12:40:45 -08:00
922746da75
DRTVWR-559 Nudge Intel HD 3000 shader compilation failure
2023-03-07 17:22:26 -06:00
29b3727b8c
SL-19355 Irradiance rebalance.
2023-03-07 14:06:01 -06:00
8564da5831
Improved detail for llvertexbuffer attribute mask assertion failure in DRTVWR-559
2023-03-06 11:38:24 -08:00
bc7856098f
SL-19281 Unify handling of haze and gamma between fullbright and not and move haze back to sRGB color space to stay consistent with sky colors. Also fix broken "roughness" stuck at 0.2.
2023-03-02 16:36:03 -06:00
3947bd13fd
Merge pull request #97 from secondlife/brad/DRTVWR-559
...
brad/drtvwr-559 mac shader and assert fixes
2023-02-28 10:33:37 -08:00
78e7ada94b
Mac shader and assertion fixes for DRTVWR-559
2023-02-27 17:35:24 -08:00
b27c41578b
SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms
2023-02-27 15:57:45 -08:00
46b2c0660a
Hammering on more mac optimizations.
...
SL-18563
2023-02-25 22:24:46 -08:00
33085b9d83
SL-19265: Fix precision issue with texture transforms by moving transform matrix calculation into the shader
2023-02-24 13:53:55 -08:00
6494eed242
SL-19228: Fix GLTF texture transform rotation and add UV debug (PBR only). See textureUtilV.glsl for UV coordinate comments
2023-02-23 14:28:42 -08:00
68c4ff7dce
SL-18762 Fix for broken local lights on alpha when wearing a HUD attachment. Also fix stuck sun/moon and incidental decruft.
2023-02-14 10:10:12 -06:00
d0993b7376
SL-19195 Fix for world map tiles not rendering if empty.
2023-02-10 13:31:57 -06:00
a2647e953a
SL-18229 Fix for PBR materials on HUDs misbehaving. Incidental decruft.
2023-02-07 18:25:22 -06:00
b52699091d
SL-19147 Water quality pass. Remove gl_FragDepth writes from sky rendering (optimization). Incidental decruft.
2023-02-07 11:40:56 -06:00
627c7de801
SL-19134 Some texture related adjustments
2023-02-07 12:36:20 +02:00
c8fb3ad4de
SL-19148 Decruft followthrough -- fix for crash when running from installer. Feed fresnel component into PBR alpha. Remove obsolete "shader_hierarchy.txt", remove redundant LL_PROFILE_ZONE_SCOPED, remove unused shader feature flag.
2023-02-06 10:28:26 -06:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
830cb6b665
SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space.
2023-02-03 17:18:39 -06:00
b2f890408e
SL-19089 Changing UI scale crashes viewer
...
This makes no sense, trying to add a glyph now will have no width or height set, neither character width or heigh, yet release viewer does that. Fixed code to match release and set width and height despite char width not being up to date.
2023-02-03 20:50:43 +02:00
6f136d403b
SL-19000 Fix various 3D UI components not respecting depth buffer. Incidental decruft. Do I get a prize for 1000th jira?
2023-02-01 17:09:34 -06:00
c136c5ece4
SL-18772 Potential fix for failed shader load on Intel HD 3000
2023-02-01 16:23:44 -06:00
4cbdc245ac
SL-18154 Followup -- fix mac build
2023-01-31 18:34:47 -06:00
4522864f0b
SL-18772 Potential fix for failed shader load on Intel HD 3000
2023-01-31 17:05:58 -06:00
280c92b7de
SL-18154 Followup -- Use Henri's xxHash integration to speed up UI Vertex Buffer cache
2023-01-31 16:45:39 -06:00
c9d56e212a
SL-19015 Balance sun/sky ambiance with punctual light ambiance. Prevent irradiance maps from being brighter than the environment.
2023-01-31 15:01:05 -06:00
10b8dcc497
SL-19015 Bump probe resolution back to 256 by default (drop to 128 if vram < 2GB), remove irradiance map feedback loop (one bounce, but but more stable and allows for much brighter first bounce), make sky contribution to irradiance not tint the world blue. Make irradiance that appears in radiance maps match world irradiance.
2023-01-30 18:56:19 -06:00
3ef31cb9b2
SL-19203 et al -- Integrate SSR with reflection probes, tweak probe blending. ( #63 )
...
* SL-19203 WIP -- Integrate SSR with reflection probes. Decruft LLRenderTarget.
* SL-19203 WIP -- Re-integrate SSR. Incidental decruft.
* SL-19203 WIP -- SSR frame delta correction (still broken for Z)
* SL-19203 WIP -- SSR frame delta Z fix
* SL-19203 WIP -- Make SSR toggleable again and disable SSR in cube snapshots.
* SL-19203 WIP -- Soften sphere probe transitions and fix reflections on void water (make fallback probe a simple terrain+water+sky probe). Remove parallax correction for automatic probes to reduce artifacts.
* SL-19203 Tune probe blending.
* SL-19203 Cleanup.
2023-01-27 17:24:22 -06:00
d9e82ab14a
DRTVWR-489-emoji: Pull in some small changes from Kitty's work to move the macOS build forwards
2023-01-26 17:04:35 -08:00
623bb4d58c
SL-18772 Potential fix for failed shader load on Intel HD 3000
2023-01-24 14:17:36 -06:00
a851aa83e7
SL-18958 Fix for broken water distortion map and depth buffer. Incidental decruft.
2023-01-24 12:50:17 -06:00
274da636a0
SL-18869 Followup -- AMD optimization pass.
2023-01-23 11:48:43 -06:00
984bdcd9d9
SL-18869 Followup -- AMD compatibility pass.
2023-01-20 18:25:53 -06:00
10c85eab94
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-01-20 13:00:57 -06:00
c83e664148
SL-18869 GL 3 compatibility pass and minor decruft.
2023-01-20 13:00:40 -06:00
d8cdfaa645
Fix for SL-19010 mac crash in LLManipTranslartge::restoreGL().
...
Attempt to simplify and avoid use of GL_UNSIGNED_INT_8_8_8_8_REV where not needed
2023-01-19 14:25:14 -08:00
8b39e0e1a6
SL-18869 Followup -- leverage "small commands" and time slicing to get rid of frame stalls on main thread without the need for multithreaded GL
2023-01-19 11:33:11 -06:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
1ff3b1ffa5
MacOS build fix
2023-01-12 19:49:35 +02:00
ccedb5a6de
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
2023-01-11 16:20:35 -06:00
b9a4d81d51
SL-18869 Optimizations -- Revive LLVBOPool and fix silly typo in renderShadowSimple
2023-01-11 16:20:24 -06:00
33290ef1bb
MacOS build fix
2023-01-11 23:03:50 +02:00
3ac990e6ce
SL-18869 Touch up -- fix some Debug GL assertions and restore shadows.
2023-01-11 00:04:41 -06:00
493d501cde
SL-18869 Optimizations -- Revive "Frame Profile" and GL_DEPTH_CLAMP. Remove usage of gl_FragDepth from shadow shaders.
2023-01-10 19:49:18 -06:00
68da705f3b
SL-18869 Optimizations -- Quiet command buffer -- VBO cache for UI et al and remove many unneeded VBO binds.
2023-01-10 18:42:09 -06:00
fdc0ea64f0
SL-18869 Optimizations -- LLVertexBuffer overhaul and shuffle of shadow map rendering to a place where the main camera has taken a stab at object updates for this frame before shadow map rendering has at them.
2023-01-10 17:36:05 -06:00
a2d17d3c1e
SL-18869 Optimizations -- Decruftify LLRenderTarget, use a shader to copy color/depth instead of glCopyTexSubImage or glBlitFrameBuffer
2023-01-09 18:12:54 -06:00
b3fc82ff1d
SL-18869 Optimizations -- decruftify LLVertexBuffer and make an optimal "renderShadowSimple" utility function for pushing vertex buffers only.
2023-01-09 13:05:32 -06:00
f41278082f
SL-18809: Merge 'DRTVWR-559' of secondlife/viewer into sl-18809
2022-12-09 16:34:28 -05:00
fc424a0db9
SL-18809: Add WorkSchedule; remove timestamps from WorkQueue.
...
For work queues that don't need timestamped tasks, eliminate the overhead of a
priority queue ordered by timestamp. Timestamped task support moves to
WorkSchedule. WorkQueue is a simpler queue that just waits for work.
Both WorkQueue and WorkSchedule can be accessed via new WorkQueueBase API. Of
course the WorkQueueBase API doesn't deal with timestamps, but a WorkSchedule
can be accessed directly to post timestamped tasks and then handled normally
(e.g. by ThreadPool) to run them.
Most ThreadPool functionality migrates to new ThreadPoolBase class, with
template subclass ThreadPoolUsing<WorkQueue> or ThreadPoolUsing<WorkSchedule>
depending on need. ThreadPool is now an alias for ThreadPoolUsing<WorkQueue>.
Importantly, ThreadPoolUsing::getQueue() delivers a reference to the specific
queue subclass type, so you can post timestamped tasks on a queue retrieved
from ThreadPoolUsing<WorkSchedule>::getQueue().
Since ThreadPool is no longer a simple class but an alias for a particular
template specialization, introduce threadpool_fwd.h to forward-declare it.
Recast workqueue_test.cpp to exercise WorkSchedule, since some of the tests
are time-based. A future todo would be to exercise each applicable test with
both WorkQueue and WorkSchedule.
2022-12-09 13:21:45 -05:00
c489481ec5
SL-18785 Fix for corrupt reflection probes on various preference changes. Add UI for Screen Space Reflections.
2022-12-06 09:59:30 -06:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
0b188ac04e
Merge remote-tracking branch 'origin/main' into DRTVWR-528
2022-11-28 14:33:27 -08:00
b1dabc0f00
SL-18669 Fix for broken lighting on transparent faces. Optimize handling of "bindDeferredShader" and shadow map setup.
2022-11-18 11:45:04 -06:00
e2d1af5c4f
SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy.
2022-11-17 13:35:39 -06:00
8d2ac419b2
SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers.
2022-11-16 14:49:17 -06:00
97277e74a9
Merged in SL-18332 (pull request #1194 )
...
First pass of Screen Space Reflections
Approved-by: Dave Parks
2022-11-14 18:12:22 +00:00
843a5c287e
SL-18485 Cleanup -- remove unused GLTF specific vertex attributes from LLVertexBuffer (blows past 16-attribute limit)
2022-11-14 11:40:18 -06:00
7ebaa2d2e5
Merge branch contribution/emoji into DRTVWR-489-emoji
2022-11-09 23:25:02 +01:00
ed942987ca
Merge branch contribution/emoji into contribution/emoji-ui
2022-11-06 16:26:45 +01:00
24bd7b2311
Add support for OT-SVG fonts
2022-11-06 16:25:35 +01:00
9e7b725c15
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 12:55:18 -07:00
29e344bbd0
SL-18483 Work around for crash on AMD when using glGenerateMipmap on cubemap array.
2022-10-31 15:19:28 -05:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
cf2afdc541
Add emoji as its own font to promote character reuse
2022-10-23 16:26:36 +02:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
42ec639c86
SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox.
2022-10-12 14:46:51 -05:00
b6e576c7c2
SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files.
2022-10-11 20:20:39 -05:00
7ff19ec98c
Merged DRTVWR-559 into SL-18290
2022-10-10 15:19:04 +00:00
9448db5d4a
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-06 18:40:01 -05:00
a73b226f9e
Merged DRTVWR-559 into SL-18290
2022-10-06 19:53:18 +00:00
db92f95649
Switch away from std::string
...
API expects const char* anyways.
2022-10-06 15:18:17 -04:00
be1cdc1aaa
Initial pass at adding KHR_debug support
...
This still needs some work - I'm not super satisfied with the overall structure of the code. Will continue to iterate as I add in proper RenderDoc support.
2022-10-05 09:48:18 -07:00
30bcc7d6d5
SL-18190 WIP - Add refraction to water without splitting scene between above and below water
2022-10-05 08:11:33 -05:00
1900df3615
SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still busted). WIP on reflection probe/PBR driven water shader.
2022-10-04 12:20:19 -05:00
411aa9f727
SL-18190 Fix for haze color being completely wrong (now it's just half wrong).
2022-09-29 00:19:52 -05:00
2e499bcc40
SL-18190 Prune srgb_to_linear from atmosphericsFuncs.glsl
2022-09-28 19:14:00 -05:00
aaf7b17db0
SL-18190 WIP -- Take 2 on linear space windlight (more methodical approach -- make desired interface but brute force color conversions). Placeholder PBR water and move to deprecate forward rendering shaders.
2022-09-27 23:32:02 -05:00
64cfcea3f4
SL-18190 Reduce banding - experiment with RGB16F reflection probes
2022-09-23 18:13:20 -05:00
e5d463ca20
SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
2022-09-22 17:27:18 -05:00
c466e44334
SL-18190 Reduce banding (stay in linear space as much as possible, increase precision of reflection probes). Faster radiance and irradiance map generation.
2022-09-20 19:09:26 -05:00
1eeee12ecb
SL-18190 Don't allocate mips for irradiance maps because they're never generated. Disable OpenGL core profile on Intel by default.
2022-09-20 12:28:45 -05:00
a5233ed774
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-19 17:27:41 -05:00
04d3a29a69
SL-18190 Faster better stronger radiance/irradiance maps
2022-09-19 17:27:33 -05:00
718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
b2cf07f53c
WIP - switch PBR implementations
2022-09-17 01:12:52 -05:00
09f3d6eaee
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-16 16:25:38 -05:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
e61b6570b1
SL-17701 Fix for crash on AMD WHQL drivers.
2022-09-14 18:53:16 -05:00
ff3a28422d
SL-17701 WIP -- Parity for point lights between opaque and transparent PBR materials
2022-09-13 17:07:30 -05:00
c9565d6493
SL-17967 - remove some debug/devel code
2022-09-06 14:45:44 -07:00
60cc58fbfc
SL-17967 Fix for confounding program and shader objects when fetching logs and fix for gl errors on AMD windows
2022-09-02 21:05:53 -05:00
4c2b80fd00
Merge branch 'SL-17967' of ssh://bitbucket.org/lindenlab/viewer into SL-17967
2022-09-02 19:54:25 -05:00
00b1fec960
SL-17967 Purge OpenGL extensions (use core API only)
2022-09-02 19:53:56 -05:00
a6c385a8cb
SL-17967 - bad copypasta
2022-09-02 17:21:44 -07:00
013a713001
SL-17967 - slightly more meaningful ogl error reporting
2022-09-02 15:44:19 -07:00
88e1740d20
SL-17967 - block layout binding acceptable to apple
2022-09-01 16:18:14 -07:00
01d03edd85
SL-17967 - _ARB constant removal
2022-09-01 13:38:22 -07:00
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
3b70c9d49c
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade
2022-08-30 10:20:15 -07:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
6fbc733c97
SL-17967 - demonstrate what features are provided in various profiles
2022-08-29 18:00:43 -07:00
bab70f6f15
Review + resolve minor issues
2022-08-29 00:01:43 +02:00
5440464a9c
Merge branch 'contribution/emoji'
2022-08-28 00:08:38 +02:00
509cfcad31
experiments for turning on opengl core profile on mac for DRTVWR-559
2022-08-26 09:30:01 -07:00
9bee2a92d2
SL-17997 Follow up from beta breakers results.
2022-08-26 10:51:42 -05:00
664ba53e4c
SL-17584 Make setShaders crashes more informative
2022-08-20 00:35:02 +03:00
43de9f202e
Merge branch 'master' into DRTVWR-528
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-07-12 00:42:54 +03:00
9a8ab9592d
SL-17732 std_bad_alloc at setManualImage
2022-07-06 22:22:36 +03:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
5cfc336ba2
Fix for 2-bit errors in writing to and reading from norm.w
2022-06-28 18:46:48 -05:00
254bbc86e5
Add emissiveRect to softenLightF.glsl
2022-06-28 15:39:04 -05:00
7ac0923e33
SL-17274: Document which shader encodesNormal includes
2022-06-27 14:09:44 -07:00
9439c721f4
SL-17274 Hook up emissive map and non-texture parameters to pbropaqueF.glsl
2022-06-24 12:15:34 -05:00
c13e204474
WIP adding check for existence of ARB_texture_cube_map_array extension
2022-06-23 22:53:55 -07:00
6b85705951
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
2022-06-23 22:53:36 -07:00
ac62a74458
Merged DRTVWR-559 into SL-17274_gbuffer_flags
2022-06-23 15:42:42 +00:00
d67e1f4f91
Merged DRTVWR-559 into SL-17274_view_dir
2022-06-23 14:53:07 +00:00
4d2b2f464b
SL-17274: Add GBuffer flag for PBR
2022-06-22 11:32:10 -07:00
d0d1b832d4
SL-17600 Proper irradiance probes.
2022-06-22 13:25:50 -05:00
27ca7760cc
SL-17274: Remove hard-coded magic number checking if G-Buffer flag is set
2022-06-21 22:23:38 -07:00
77b96114c3
SL-17274 Cleanup hard-coded gbuffer atmos flag for softenlight
2022-06-21 22:00:12 -07:00
31e2fa5e50
SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).
2022-06-21 22:44:30 -05:00
36d9fa9015
SL-17274: Add view_dir uniform
2022-06-21 16:50:09 -07:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
beae4564e3
SL-17584 Make setShaders crashes more informative
2022-06-15 16:00:21 +03:00
929abcd296
SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager
2022-06-10 16:36:38 -05:00
509476f95e
SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes.
2022-06-10 01:13:41 -05:00
0bf91fc141
SL-17483: Merge branch 'track-threadpools' into sl-17483.
...
This picks up ThreadPoolSizes override logic embedded in ThreadPool's
constructor, plus the new static ThreadPool::getConfiguredWidth() and
getWidth() methods.
2022-06-09 11:22:01 -04:00
276647789a
SL-17483: Simplify ThreadPool instantiations.
...
Now that LL::ThreadPool's constructor has subsumed the work of discovering a
runtime override width, LLAppViewer::initGeneralThread() can simply pass the
compile-time default width instead of redundantly checking ThreadPoolSizes.
Also the default ThreadPool capacity has been bumped up to what "General" and
"LLImageGL" were requesting, so they need not pass that explicitly or explain
in comments why they're doing it.
But until we start throwing work at the "General" ThreadPool, configure it
down to 1 thread in settings.xml.
2022-06-09 10:36:13 -04:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
4261cbba78
SL-17485 Add texture memory accounting for OS X
2022-06-01 10:34:33 -05:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
4cfa59d3f1
SL-17473 Viewer not clearing all Vertex Buffers in some cases
...
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
2022-05-26 22:43:12 +03:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
6eaf8521ab
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
2022-05-20 19:05:28 -05:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
3564b24e2a
SL-17286 Reflection probe alpha/fullbright support.
2022-05-19 22:24:41 -05:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
b2141e9446
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559
2022-05-16 12:26:17 -05:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00:00
fa26abf901
Fix mac build for SL-17283 reflections work
2022-05-04 15:32:34 -07:00
93260cfeff
SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-04 16:07:50 +00:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
93a0259666
SL-17282 prototype mixing of reflection map into legacy materials
2022-04-29 13:51:11 +00:00
Andrey Lihatskiy