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 |
|
Andrey Kleshchev
|
148786999d
|
viewer#1698 Uniform being out of range shouldn't crash viewer
|
2024-06-12 18:12:35 +03: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 |
|
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 |
|
Ansariel
|
5c93f37775
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llrender.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewerwindow.cpp
|
2024-03-05 03:31:18 +01:00 |
|
Andrey Kleshchev
|
6c43baf029
|
Issue #54 LLRender::init crash
|
2024-03-05 01:58:57 +02:00 |
|
Andrey Kleshchev
|
56a9322569
|
Issue #54 LLRender::init crash
|
2024-01-25 01:40:53 +02:00 |
|
Ansariel
|
6c389316f1
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llrender/llrender.h
# indra/newview/VIEWER_VERSION.txt
|
2023-10-27 13:00:41 +02:00 |
|
Brad Linden
|
26163e2154
|
Fix DRTVWR-559 std::array usage in llrender and llprimitive after merge
|
2023-10-25 16:44:14 -07:00 |
|
Ansariel
|
11e9d2cdb6
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# 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/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2023-04-29 23:32:04 +02:00 |
|
RunitaiLinden
|
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 |
|
Ansariel
|
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 |
|
Jonathan "Geenz" Goodman
|
f4274ba64e
|
Move mipmap generation into LLRenderTarget.
DRTVWR-583
|
2023-04-14 03:08:28 -07: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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
87c38379e1
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-06-10 12:32:42 +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 |
|
Ansariel
|
381f8936f0
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llrender.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexture.cpp
|
2021-12-03 18:23:05 +01:00 |
|
Andrey Kleshchev
|
7929230c04
|
mac build fix
remove unused variable
|
2021-12-02 01:19:40 +02: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
|
8b92652806
|
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
|
2021-11-30 17:04:35 -07: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 |
|
Dave Houlton
|
68e09edad0
|
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
|
2021-11-30 17:04:35 -07:00 |
|
Ansariel
|
7427b46ea5
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
|
2021-11-12 15:21:52 +01:00 |
|
Dave Parks
|
e774bffb28
|
SL-16202 Fix for textures appearing black or flashing white due to optimization bugs.
|
2021-10-21 21:19:48 +00:00 |
|
Runitai Linden
|
a1e6cbe4a8
|
SL-16166 Apply LLRenderPass::pushBatch optimizations to LLDrawPoolBump::pushBatch
|
2021-10-13 10:35:39 -05:00 |
|
Runitai Linden
|
52e1a45659
|
SL-16166 Optimization pass on LLRenderPass::pushBatch
|
2021-10-12 14:46:19 -05:00 |
|
Dave Parks
|
d00272e0cc
|
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
|
2021-10-11 16:03:40 +00:00 |
|
Ansariel
|
caf7f6c1d2
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:53:39 +01:00 |
|
Ansariel
|
16c14ea4cb
|
Don't exceed the supported line width
|
2020-10-18 02:21:58 +02:00 |
|
Ansariel
|
ac94268e5e
|
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
|
2020-10-18 02:21:58 +02:00 |
|
Ansariel
|
14fb8f66f8
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-09-24 16:34:12 +02:00 |
|
Andrey Kleshchev
|
177ad21ade
|
SL-13729 Performance of LLUI and LLRender2D
|
2020-09-17 19:59:48 +03:00 |
|
Ansariel
|
52019b64e8
|
Merge viewer-eep
|
2019-04-03 18:45:39 +02:00 |