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

301 Commits (23edfd0bfa4a0e3ec2b2ff80cf956a8bcd39c55b)

Author SHA1 Message Date
Ansariel 0514918bed Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	scripts/messages/message_template.msg.sha1
 2023-09-21 18:34:10 +02:00
RunitaiLinden 894c9e0417 SL-19842 WIP -- Move sky auto adjustment magic numbers to debug settings. 2023-08-22 13:17:58 -05:00
Ansariel 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
Dave Parks 25ede86382 SL-19172 Texture streaming tune up. Incidental decruft. 2023-03-10 10:52:35 -06:00
Dave Parks 29b3727b8c SL-19355 Irradiance rebalance. 2023-03-07 14:06:01 -06:00
Ansariel 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
Dave Parks 4cbdc245ac SL-18154 Followup -- fix mac build 2023-01-31 18:34:47 -06:00
Dave Parks 280c92b7de SL-18154 Followup -- Use Henri's xxHash integration to speed up UI Vertex Buffer cache 2023-01-31 16:45:39 -06:00
RunitaiLinden 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
Dave Parks a851aa83e7 SL-18958 Fix for broken water distortion map and depth buffer. Incidental decruft. 2023-01-24 12:50:17 -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 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
Andrey Kleshchev 33290ef1bb MacOS build fix 2023-01-11 23:03:50 +02:00
Dave Parks 3ac990e6ce SL-18869 Touch up -- fix some Debug GL assertions and restore shadows. 2023-01-11 00:04:41 -06:00
Dave Parks 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
Dave Parks 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
Ansariel 85fa900fa7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-20 21:51:53 +01:00
Ansariel d5ed58a70e Fix line widths: line widths > 1.0 are deprecated in current core profile, but not invalid; checking valid range should be sufficient if line widths > 1.0 will ever get removed in a future OGL version 2022-11-17 21:59:22 +01:00
Ansariel 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
Jonathan Goodman 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
Andrey Kleshchev 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
Ansariel 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
Dave Parks 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
Dave Parks 411aa9f727 SL-18190 Fix for haze color being completely wrong (now it's just half wrong). 2022-09-29 00:19:52 -05:00
Dave Parks 2e499bcc40 SL-18190 Prune srgb_to_linear from atmosphericsFuncs.glsl 2022-09-28 19:14:00 -05:00
Ansariel 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
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 82e545fa92 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-14 09:22:29 +02:00
Dave Parks ff3a28422d SL-17701 WIP -- Parity for point lights between opaque and transparent PBR materials 2022-09-13 17:07:30 -05:00
Ansariel 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
Dave Parks 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
Dave Parks 00b1fec960 SL-17967 Purge OpenGL extensions (use core API only) 2022-09-02 19:53:56 -05:00
Howard Stearns 01d03edd85 SL-17967 - _ARB constant removal 2022-09-01 13:38:22 -07:00
Howard Stearns 2082443220 SL-17967 - Git rid of ARB that is in core 2022-09-01 10:58:27 -07:00
Ansariel 3f145c0c3f Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 
# Conflicts:
#	indra/llcommon/llframetimer.cpp
#	indra/llcommon/llprofiler.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
 2022-08-30 22:17:59 +02:00
Dave Parks 197ac7cc20 Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 2022-08-30 10:46:36 -05:00
Ansariel 87c38379e1 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-10 12:32:42 +02: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
Ansariel 3c0df154f7 Manually applying 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-28 14:08:00 +02:00
Andrey Kleshchev 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
Ansariel 3765c775cb Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-05-21 15:04:54 +02:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00:00
Dave Parks 34e79c8f4e SL-17005 WIP Simplify what feeds texture loading bias to only pay attention to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming). 2022-03-11 10:21:08 -06:00
Ansariel e7bc3f3a5a Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-16 10:54:59 +01:00
Dave Parks f47730b92c SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled. 2022-02-14 18:07:24 +00:00
Ansariel 212e6d8fc1 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-22 11:46:39 +01:00
Runitai Linden 1a440be5e1 SL-16653 Fix for some textures having incorrect texel colors after the first row (and add more paranoia checks on texture data). 2022-01-19 10:35:58 -06:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00