9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
80ea30af1a
#1769 gltf optimization pass ( #1816 )
...
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-21 13:13:08 -05:00
4e593dcded
Merge pull request #1797 from secondlife/release/maint-a
...
merge release/maint-a into develop and close maint-a
2024-06-18 11:48:37 -07:00
375555012f
1736 audit texture image unit usage on os x ( #1739 )
...
* #1736 Remove some unused samplers from glsl files and refactor shader manager to assume 16 texture image units and 4 indexed texture units all the time.
2024-06-14 17:06:07 -05:00
15b3c9f164
Fix a few merge issues
2024-06-13 02:22:03 +02:00
148786999d
viewer#1698 Uniform being out of range shouldn't crash viewer
2024-06-12 18:12:35 +03:00
d9789bfaf2
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
227e9be068
#1654 generate normals and tangents according to gltf specification ( #1662 )
...
* Disable unloading of objects in background.
* Add unlit GLTF shader variant
2024-06-10 10:43:38 -05:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
15fd13f830
#1530 Increase joint limit for GLTF Assets ( #1582 )
...
* Migrate GLTF scene rendering to its own shaders
* Add support for ambient occlusion map separate from metallic roughness map (or absent)
* Use UBO's for GLTF joints
* Better error handling of downloading GLTF assets
2024-05-29 16:56:39 -05:00
2f41200384
Remove tinygltf dependency from LL::GLTF ( #1541 )
...
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
2024-05-28 09:45:40 -05:00
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
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
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
b2c2713672
Convert BOOL to bool in llrender
2024-02-20 02:14:01 +02:00
7316441f22
llrender: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
d8dd4d9c0c
Just about got hero reflection maps working.
...
DRTVWR-583
2023-06-27 20:01:52 -07:00
87bda55268
Add a binary cache for compiled shaders using glProgramBinary ( #216 )
...
* Add a binary cache for compiled shaders using glProgramBinary
* Add additional sanity checking to shader binary save and load, hook up cache clear and menu option
* Fix default init of shader cache data struct and clear gl errors before glGetError calls
---------
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2023-05-17 18:30:27 -05:00
cdc9852f05
SL-19709 Fix for fullbright shiny not factoring out exposure and flickering fullbright alpha. Incidental decruft.
2023-05-15 11:01:24 -05:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
f4274ba64e
Move mipmap generation into LLRenderTarget.
...
DRTVWR-583
2023-04-14 03:08:28 -07:00
6d5c169716
Merge branch 'DRTVWR-559' into DRTVWR-559-post-refactor
2023-04-12 15:18:27 -07:00
58df456675
Fixed DoF
2023-04-12 14:50:14 -07:00
2b2154f021
SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time.
2023-04-11 15:09:58 -05:00
56b21054eb
Get DoF working
...
Need to fix up bloom.
DRTVWR-559
SL-19524
SL-19513
2023-04-10 11:29:50 -07:00
4e306c9066
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
2023-03-31 10:54:22 -07:00
b44ad50f75
Move glow extract to be after tonemapping.
...
SL-19513
2023-03-31 10:54:19 -07:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
a2647e953a
SL-18229 Fix for PBR materials on HUDs misbehaving. Incidental decruft.
2023-02-07 18:25:22 -06:00
c8fb3ad4de
SL-19148 Decruft followthrough -- fix for crash when running from installer. Feed fresnel component into PBR alpha. Remove obsolete "shader_hierarchy.txt", remove redundant LL_PROFILE_ZONE_SCOPED, remove unused shader feature flag.
2023-02-06 10:28:26 -06:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
830cb6b665
SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space.
2023-02-03 17:18:39 -06:00
c9d56e212a
SL-19015 Balance sun/sky ambiance with punctual light ambiance. Prevent irradiance maps from being brighter than the environment.
2023-01-31 15:01:05 -06:00
a851aa83e7
SL-18958 Fix for broken water distortion map and depth buffer. Incidental decruft.
2023-01-24 12:50:17 -06: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
3ac990e6ce
SL-18869 Touch up -- fix some Debug GL assertions and restore shadows.
2023-01-11 00:04:41 -06:00
493d501cde
SL-18869 Optimizations -- Revive "Frame Profile" and GL_DEPTH_CLAMP. Remove usage of gl_FragDepth from shadow shaders.
2023-01-10 19:49:18 -06:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
b1dabc0f00
SL-18669 Fix for broken lighting on transparent faces. Optimize handling of "bindDeferredShader" and shadow map setup.
2022-11-18 11:45:04 -06:00
e2d1af5c4f
SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy.
2022-11-17 13:35:39 -06:00
8d2ac419b2
SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers.
2022-11-16 14:49:17 -06: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
db92f95649
Switch away from std::string
...
API expects const char* anyways.
2022-10-06 15:18:17 -04:00
be1cdc1aaa
Initial pass at adding KHR_debug support
...
This still needs some work - I'm not super satisfied with the overall structure of the code. Will continue to iterate as I add in proper RenderDoc support.
2022-10-05 09:48:18 -07:00
718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
e61b6570b1
SL-17701 Fix for crash on AMD WHQL drivers.
2022-09-14 18:53:16 -05:00
Ansariel