cfcbd6fc54
Linux: selectively disable a few compiler warnings that are most likely bogus
2024-01-07 18:45:08 +01:00
4532e17e3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llpanelface.cpp
2023-09-20 15:07:19 +02:00
f479c54fbf
SEC-430 'WARNING: LLFace::getGeometryVolume: Index buffer overflow' occuring 500 times plus per minute
2023-09-18 12:29:17 +02: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
88a4d1f5d3
SL-19655 Remove a couple unused debug settings and related code (update)
2023-09-05 19:14:19 +02:00
f075bf7599
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build_viewer.yml
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
a9cb392637
Compile warning/error workaround.
...
Tested by setting mat_normal to some magic value and then
asserting that it was changed by the time we get here.
2023-08-28 23:49:22 +02:00
aac968e43a
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/lluuid.cpp
# indra/llimage/llimageworker.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerobject.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-05-17 23:23:28 +02:00
6f5f16e031
SL-19655 Remove concept of "low priority" updates (RenderDebugGLSession assertion stomping pass). Remove a couple unused debug settings and related code.
2023-05-17 13:40:33 -05:00
8e9b3a8f37
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/pipeline.cpp
2023-05-12 12:06:57 +02:00
ffa21ae649
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-04-28 00:39:47 +02:00
45fdf20c3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2023-04-21 18:32:34 +02:00
aaedacf3f3
DRTVWR-559 Fix for bad vertex data getting sent to PBR alpha shader (auto alpha mask regression).
2023-04-19 18:15:28 -05:00
d61d70e19d
Linux: make it build
2023-04-16 18:19:07 +02:00
68e5f326b3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
2023-03-31 18:54:16 +02:00
afd49409a7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/FreeType.cmake
# indra/cmake/ViewerMiscLibs.cmake
2023-03-31 16:56:37 +02:00
90e8853948
Linux: Quench/fix some gcc warnings, unsure how genuine they are at this point.
2023-03-26 15:51:50 +02: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
40e942b491
SL-19345: Fix Blinn-Phong normspec materials not having texture transforms on their normal/specular textures
2023-03-06 13:58:33 -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
db44e06d66
SL-19294: Fix Blinn-Phong texture transforms affecting GLTF materials
2023-03-02 10:37:56 -08:00
ca5c9c9215
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llviewershadermgr.cpp
2023-02-04 15:17:29 +01:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
d8eecb462a
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
# indra/newview/llface.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
2023-02-03 20:26:22 +01:00
93b1da52f5
SL-18908 Make media texture override base color and emissive texture on PBR materials when present.
2023-02-02 14:35:09 -06: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
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
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
78feca373e
SL-12069 Backed out changeset: 544a91982eba ( #13 )
...
Originally a fix for MAINT-4773/SL-5842 (transparent alpha being white). Reverting due to a critical flaw of the fix replacing material (sometimes server side included). And ignoring user and script input in some cases that makes scripts misbehave.
Viewer should Not modify existing content of own volition.
2022-11-29 21:42:43 +02: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
d3a1b88511
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-11-11 11:29:58 +01:00
ad7aa54089
performance floater updated to align upstream merge of contribution
2022-11-08 18:52:37 +00:00
9e7b725c15
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 12:55:18 -07:00
d5e52b6443
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-21 11:12:51 +02:00
8741c05cc1
SL-18105 Hook up TE override material to render pipe by way of render material.
2022-10-19 17:23:54 -05: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
07bca31e06
SL-18190 Fix alpha not playing nice with water surface by split LLDrawPoolAlpha into two passes, one above water, one below water, and clip against water plane. Currently brute forces two complete alpha passes, still need to cull against water plane and add support for fullbright shaders.
2022-10-10 18:53:43 -05: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
c3eb62664b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-09-26 15:21:07 +02:00
75de4d3276
SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes.
2022-09-23 12:53:24 -05:00
8f1d226865
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
2022-09-23 11:19:56 -05: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
c5af5d10ed
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-12 11:48:30 -05:00
d7c77e5c64
SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after generating tangents
2022-09-12 11:48:16 -05:00
Zi Ree