29b3727b8c
SL-19355 Irradiance rebalance.
2023-03-07 14:06:01 -06: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
4cbdc245ac
SL-18154 Followup -- fix mac build
2023-01-31 18:34:47 -06:00
280c92b7de
SL-18154 Followup -- Use Henri's xxHash integration to speed up UI Vertex Buffer cache
2023-01-31 16:45:39 -06: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
a851aa83e7
SL-18958 Fix for broken water distortion map and depth buffer. Incidental decruft.
2023-01-24 12:50:17 -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
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
33290ef1bb
MacOS build fix
2023-01-11 23:03:50 +02:00
3ac990e6ce
SL-18869 Touch up -- fix some Debug GL assertions and restore shadows.
2023-01-11 00:04:41 -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
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
85fa900fa7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-20 21:51:53 +01:00
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
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
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
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
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
411aa9f727
SL-18190 Fix for haze color being completely wrong (now it's just half wrong).
2022-09-29 00:19:52 -05:00
2e499bcc40
SL-18190 Prune srgb_to_linear from atmosphericsFuncs.glsl
2022-09-28 19:14:00 -05: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
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
82e545fa92
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-14 09:22:29 +02:00
ff3a28422d
SL-17701 WIP -- Parity for point lights between opaque and transparent PBR materials
2022-09-13 17:07:30 -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
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
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
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
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
87c38379e1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-10 12:32:42 +02:00
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
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
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
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00:00
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
e7bc3f3a5a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-16 10:54:59 +01:00
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
212e6d8fc1
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-22 11:46:39 +01:00
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
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
206a8bb30f
SL-16606: Add profiler category PIPELINE
2022-01-14 11:50:20 -08:00
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
e7830b39f0
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
2021-12-03 15:07:31 +00:00
7929230c04
mac build fix
...
remove unused variable
2021-12-02 01:19:40 +02:00
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
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
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
e774bffb28
SL-16202 Fix for textures appearing black or flashing white due to optimization bugs.
2021-10-21 21:19:48 +00:00
e7227afe02
SL-16166 Apply optimizations from pushBatch to other render call sites. Optimize out a map lookup in rigged face rendering.
2021-10-14 13:02:40 -05:00
a1e6cbe4a8
SL-16166 Apply LLRenderPass::pushBatch optimizations to LLDrawPoolBump::pushBatch
2021-10-13 10:35:39 -05:00
52e1a45659
SL-16166 Optimization pass on LLRenderPass::pushBatch
2021-10-12 14:46:19 -05:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
675514bdb3
SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging.
2021-09-27 23:56:06 +00:00
ddfb4a5d1b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 14:30:18 +02:00
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
2057fa9716
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 18:10:48 +01:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
a5aac89809
SL-14035: Don't use sRGB textures when not specified
2021-01-06 18:17:56 -08:00
4d9ef8e06b
BUG-228586 and related. Colour space fixes to address specularity issues
...
This is effectively just completing the reversion of the gamma changes made by LL then partially backed out. (from Rye)
2020-12-28 11:58:55 +00:00
caf7f6c1d2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:53:39 +01:00
e4d6a76486
Add one more check
2020-10-18 15:19:32 +02:00
16c14ea4cb
Don't exceed the supported line width
2020-10-18 02:21:58 +02:00
ac94268e5e
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
2020-10-18 02:21:58 +02:00
7d107d3954
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 11:34:41 +02:00
83822fd199
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/llvocache.cpp
2020-09-28 22:39:06 +03:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
760dd9615c
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-08-06 10:44:57 +02:00
92ee1be5cf
SL-13521, clang-format LLRender::syncLightState() (whitespace)
2020-08-05 12:30:24 -06:00
8b314a646f
SL-13521, stamp out some remaining hard-coded 8s
2020-08-05 12:05:23 -06:00
107a7fec34
SL-13521 add an avatar appearance light to deferred mode
2020-08-04 17:14:19 -06:00
3d37c73654
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-06-17 12:10:58 +02:00
84d3065596
SL-13281, add missing srgb->linear conversion for specular
2020-06-11 23:33:14 +03:00
fff65c73fd
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-04-23 19:05:35 +02:00
024c357eb1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 18:55:47 +02:00
abe5cc5787
Fix for 'release' configuration
...
llassert is not used in 'release' configuration and build fails due to unused tex_index
2020-04-21 10:32:45 +03:00
278853824d
Fixed merge conflict and restored SL-1130
2020-04-20 21:56:21 +03:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
3d22273726
Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF
2020-03-24 11:22:01 -05:00
fcdb198a62
Merge viewer-cougar
2019-12-13 17:15:37 +01:00
74904f39e1
SL-1130 Prevent crash on mMatrix
2019-11-29 18:31:50 +02:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
95baae0235
Merge viewer-eep
2019-05-09 18:48:19 +02:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
a1e8042c1f
SL-11055, SL-10966, SL-11087
...
Make haze look more like WL.
Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
2019-05-07 15:36:43 -07:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
Dave Parks