5f190b112e
Additional profiling scopes and remove some superfluous ones.
2024-05-29 20:46:34 +01:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
9c338b3167
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llpanelface.cpp
2023-09-07 15:47:51 +02:00
8d0af77d0b
SL-19709 Fix for fullbright shiny not factoring out exposure (update)
2023-09-05 16:59:48 +02:00
4d0ebf6143
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerdisplay.cpp
2023-05-17 18:02:50 +02: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
5323ccf3b3
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/llprofilercategories.h
# indra/llcommon/lluuid.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/llagent.cpp
# indra/newview/llface.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
2023-03-20 11:14:08 +01:00
bd4b03de8b
DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.
2023-03-10 13:33:36 -06:00
25ede86382
SL-19172 Texture streaming tune up. Incidental decruft.
2023-03-10 10:52:35 -06:00
8564da5831
Improved detail for llvertexbuffer attribute mask assertion failure in DRTVWR-559
2023-03-06 11:38:24 -08:00
f4182ddc7f
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
78e7ada94b
Mac shader and assertion fixes for DRTVWR-559
2023-02-27 17:35:24 -08:00
6cbca4da71
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-01 11:40:17 +01: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
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
b4fde14f09
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-01-19 23:04:50 +01: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
75180c8746
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2023-01-12 12:08:46 +01:00
b9a4d81d51
SL-18869 Optimizations -- Revive LLVBOPool and fix silly typo in renderShadowSimple
2023-01-11 16:20:24 -06: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
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
4d8c434846
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
2022-12-08 12:18:18 +01: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
13a509fe05
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerregion.h
# indra/newview/llviewerwindow.cpp
2022-11-30 22:51:52 +01: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
d5298ac971
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-20 23:13:06 +01: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
b3eed96c20
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-16 15:44:33 +01: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
d3a1b88511
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-11-11 11:29:58 +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
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
5763aa32cc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
2022-10-12 16:25:18 +02: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
87501c03ae
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender2dutils.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
2022-09-20 11:37:09 +02:00
718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
9756e0e89e
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
2022-09-17 12:02:14 +02:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
00b1fec960
SL-17967 Purge OpenGL extensions (use core API only)
2022-09-02 19:53:56 -05: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
Beq