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
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
623bb4d58c
SL-18772 Potential fix for failed shader load on Intel HD 3000
2023-01-24 14:17:36 -06:00
984bdcd9d9
SL-18869 Followup -- AMD compatibility pass.
2023-01-20 18:25:53 -06:00
c83e664148
SL-18869 GL 3 compatibility pass and minor decruft.
2023-01-20 13:00:40 -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
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
0ae0cd0c88
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-24 20:01:04 +02: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
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
e5d463ca20
SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
2022-09-22 17:27:18 -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
c9565d6493
SL-17967 - remove some debug/devel code
2022-09-06 14:45:44 -07: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
6fbc733c97
SL-17967 - demonstrate what features are provided in various profiles
2022-08-29 18:00:43 -07:00
509cfcad31
experiments for turning on opengl core profile on mac for DRTVWR-559
2022-08-26 09:30:01 -07:00
abf0d2e92b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llvovolume.cpp
2022-06-29 23:11:18 +02:00
adfc89c831
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 23:08:37 +02:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02:00
c13e204474
WIP adding check for existence of ARB_texture_cube_map_array extension
2022-06-23 22:53:55 -07:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
4eef3f7877
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-27 23:09:50 +02:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
e5c7fd4fff
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llrender/llgl.cpp
# indra/newview/llface.cpp
# indra/newview/llvovolume.cpp
2022-05-27 12:55:19 +02:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
b2141e9446
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559
2022-05-16 12:26:17 -05:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
c184c882c6
SL-17035 Reverted a part of previous commit
...
According to davep, the intent of Debug GL is to crash and in this it's doing it's job, but the rest of the fix that makes the state not persist is a good solution.
2022-04-15 00:13:36 +03:00
e5cd4da823
SL-17035 Crash at gl_debug_callback
...
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00: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
c38812aa15
SL-16727: Revert change causing llvieweroctree to not render reflections when shadows are set to projectors cause by commit bb379cb8cc
2022-02-03 11:11:46 -08:00
Ansariel