livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,463 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

147 Commits (684bc1d1ead1b91c7adf25adeb00a95745fe02be)

Author SHA1 Message Date
Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/llcommon/llsys.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-06-21 19:46:51 +02:00
Cosmic Linden fcf9af42fa secondlife/viewer#907: Review feedback 2024-06-13 12:49:48 -07:00
Brad Linden a1f49564d6 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
Ansariel ea5ead6f4a Merge remote-tracking branch 'FS600/master' 
# Conflicts:
#	doc/contributions.txt
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
 2024-05-23 18:15:07 +02:00
Ansariel c203bb650a Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2024-05-23 01:48:45 +02:00
Brad Linden 3cb329d4fa Merge commit '29be88d60d654193926add496d2d851f7c217356' into project/gltf_development 2024-05-15 15:41:24 -07:00
Cosmic Linden ae6a402b7a secondlife/viewer#1474: Remove small texture offset from PBR terrain 2024-05-15 09:55:55 -07:00
Ansariel 2688c36b7f Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llprimitive/llgltfmaterial.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmaniptranslate.cpp
 2024-05-14 23:05:59 +02:00
Dave Parks d21f29b643
Merge branch 'project/gltf_development' into project/gltf_development 2024-05-14 14:22:46 -05:00
Cosmic Linden 9441608623 secondlife/viewer#907: Local PBR terrain texture transforms 2024-05-10 17:42:54 -07:00
Ansariel 799ebf2162 Fix broken merge and BOOL/bool issues 2024-05-10 15:16:06 +02:00
Ansariel 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
Ansariel 6340d7a418 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 2024-04-29 22:37:45 +02:00
Andrey Lihatskiy 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
Cosmic Linden 47255bf44d secondlife/viewer#1184: Stop making terrain textures undeletable 2024-04-11 17:26:02 -07:00
Ansariel 9f2be1de74 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/skins/default/xui/en/floater_tools.xml
 2024-02-12 12:54:03 +01:00
Cosmic Linden ae46dc068e secondlife/viewer-issues#67: Fix Windows release build warning 2024-02-08 14:41:49 -08:00
Cosmic Linden 9c6e351e05 secondlife/viewer-issues#67: Improve PBR terrain loading robustness 2024-02-08 13:24:16 -08:00
Cosmic Linden 139c10dbeb secondlife/viewer#711: Add more options to drop textures from terrain, not yet used 2024-02-07 10:17:54 -08:00
Ansariel 4d2549969c Merge branch 'DRTVWR-592' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolterrain.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_region_terrain.xml
 2024-01-23 16:03:33 +01:00
Cosmic Linden 38b3f663fc Merge branch 'release/materials_featurette' of github.com:secondlife/viewer into DRTVWR-592 2024-01-22 15:07:10 -08:00
Cosmic Linden 42dafa5f09 SL-20606: Refactor model matrix code 2024-01-19 15:43:11 -08:00
Cosmic Linden db4bc52829 DRTVWR-592: (WIP) PBR Terrain: Improve orientation of textures and normal maps for triplanar mapping, minor cleanup 2023-10-13 10:39:34 -07:00
Cosmic Linden d6aced7abf DRTVWR-592: Remove WIP separate code path for terrain geometry rebuilds for PBR as that is not needed at the moment 2023-10-13 10:38:54 -07:00
Cosmic Linden 35d889f7af DRTVWR-592: Create separate config option for terrain repeats. Clean up debug 2023-10-13 10:38:48 -07:00
Cosmic Linden b9ba57fd00 DRTVWR-592: (WIP) Fix terrain PBR texture repeat seam. Legacy terrain texture repeats currently broken 2023-10-13 10:38:42 -07:00
Cosmic Linden 57433341ab Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing"" 
This reverts commit 2318d65766.
 2023-10-13 10:36:51 -07:00
Cosmic Linden dfa19c5e43 DRTVWR-592: PBR terrain fallback for Mac/Intel: Drop emissive texture. Bump featuretable. 2023-10-13 10:33:16 -07:00
Cosmic Linden 2318d65766 Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing" 
This reverts commit de9184479c.
 2023-10-13 10:31:51 -07:00
Cosmic Linden de9184479c DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing 2023-10-13 09:58:50 -07:00
Cosmic Linden 94d8f669ac DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture flickering 2023-10-13 09:58:13 -07:00
Cosmic Linden 039116abd4 DRTVWR-592: (WIP) Roughly working draft of PBR terrain 2023-10-13 09:58:05 -07:00
Cosmic Linden 5d046d8835 DRTVWR-592: (WIP) (does not work) PBR terrain rendering - compiles, but doesn't render properly just yet 2023-10-13 09:57:57 -07:00
Cosmic Linden 3553fec208 DRTVWR-592: (WIP) Separate code path for terrain rendering and shaders. Just copy/paste for now. Use same draw pool 2023-10-13 09:57:10 -07:00
Cosmic Linden 94e824739b DRTVWR-592: Render PBR material terrain like legacy, using baseColor texture 2023-10-13 09:57:02 -07:00
Cosmic Linden 76bf3390eb DRTVWR-592: (WIP) Detect when terrain materials are loaded, use as fallback when terrain textures do not load 2023-10-13 09:56:55 -07:00
Ansariel 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
Dave Parks 1c2410b8af SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code. 2023-02-03 19:45:31 -06:00
Ansariel 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
RunitaiLinden 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
Ansariel 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
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Ansariel c5d9c3c2a7 Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Tracy.cmake
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_mac.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
 2022-06-03 15:07:06 +02:00
Dave Parks b6841d75c2 SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy cfd39c3663 SL-16606: Add profiler category DRAWPOOL 2022-01-14 11:50:19 -08:00
Ansariel 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
Dave Houlton fab60f242e SL-16386 purge no-op fxn LLTexUnit::setTextureAlphaBlend() 2021-11-30 17:04:35 -07:00
Dave Houlton 3d1901dd4c SL-16386 purge no-op fxn LLTexUnit::setTextureColorBlend() 2021-11-30 17:04:35 -07:00
Dave Houlton 5fcea00c4f SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType() 2021-11-30 17:04:35 -07:00