summaryrefslogtreecommitdiff
path: root/indra/llrender/llglslshader.cpp
AgeCommit message (Collapse)Author
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-06-21#1769 gltf optimization pass (#1816)Dave Parks
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-18Merge pull request #1797 from secondlife/release/maint-aBrad Linden
merge release/maint-a into develop and close maint-a
2024-06-141736 audit texture image unit usage on os x (#1739)Dave Parks
* #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-13Fix a few merge issuesAnsariel
2024-06-12viewer#1698 Uniform being out of range shouldn't crash viewerAndrey Kleshchev
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
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-11Merge tag '7.1.8-release'Erik Kundiman
source for viewer 7.1.8.9375512768
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-10#1654 generate normals and tangents according to gltf specification (#1662)Dave Parks
* Disable unloading of objects in background. * Add unlit GLTF shader variant
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
2024-05-29#1530 Increase joint limit for GLTF Assets (#1582)Dave Parks
* 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-28Remove tinygltf dependency from LL::GLTF (#1541)Dave Parks
* #1535 Image loading/saving support in boost::json driven GLTF parser * #1536 GLB Support in boost::json drvien GLTF parser
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵RunitaiLinden
gltf-dev-maint-a-merge
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-02-20Convert BOOL to bool in llrenderAnsariel
2024-02-12llrender: BOOL (int) to real boolLars Næsbye Christensen
2023-12-31Fix recommended GPU class lower than it shouldErik Kundiman
which was caused by the different kind of expected value from the samples query, which then caused the memory bandwidth to be detected as 0 according to ARB timer query, which then affected the GPU class, which eventually affected the texture loading, especially missing colours when zoomed in.
2023-09-11Assume GL_ANY_SAMPLES_PASSED is supportedErik Kundiman
2023-09-11Use the more portable GL_TIME_ELAPSED_EXTErik Kundiman
and only when it's available.
2023-09-11Use non 64 versions when no ARB timer queryErik Kundiman
2023-09-11Preprocess non portable OpenGL 3.0 codeErik Kundiman
2023-09-10Fixes to get it build again on FreeBSDErik Kundiman
and hopefully GNU/Linux too.
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-07Revert "Bring back GL funcs & macros that work on macOS"Erik Kundiman
This reverts commit e600f6504cd7edd9d2883ea7dc17c2574b1ff468.
2023-09-07Bring back GL funcs & macros that work on macOSErik Kundiman
2023-09-06GL TIME_ELAPSED_EXT as alternative to TIME_ELAPSEDErik Kundiman
2023-09-06Some GL_VERSION_2_0 sampler implementor only codeErik Kundiman
preprocessed so it doesn't get compiled on non implementors.
2023-09-06Core profile query related functionsErik Kundiman
replacing their legacy ARB counterparts.
2023-09-06Core profile vertex attribute related functionsErik Kundiman
replacing legacy ARB versions.
2023-09-06Core profile uniform related functionsErik Kundiman
replacing legacy ARB versions.
2023-09-06Core profile program object related functionsErik Kundiman
Whether to create/delete, or take the program object as an argument. Include ones for attaching & detaching shaders too, ones that deal with attributes & uniforms and so on, etc.. Replacing legacy ARB versions.
2023-09-06Core profile glCreateShader & return type GLuintErik Kundiman
to replace the less portable ARB versions.
2023-09-05Preprocess non portable GL funcs & macrosErik Kundiman
so that implementations that don't include a certain GL implementation won't fail trying to compile the code.
2023-06-27Just about got hero reflection maps working.Jonathan "Geenz" Goodman
DRTVWR-583
2023-05-17Add a binary cache for compiled shaders using glProgramBinary (#216)Rye Mutt
* 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-15SL-19709 Fix for fullbright shiny not factoring out exposure and flickering ↵RunitaiLinden
fullbright alpha. Incidental decruft.
2023-05-02DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU ↵RunitaiLinden
timer without a frame stall.
2023-04-14Move mipmap generation into LLRenderTarget.Jonathan "Geenz" Goodman
DRTVWR-583
2023-04-12Merge branch 'DRTVWR-559' into DRTVWR-559-post-refactorJonathan "Geenz" Goodman
2023-04-12Fixed DoFJonathan "Geenz" Goodman
2023-04-11SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and ↵RunitaiLinden
brightness to allow ACES Hill all the time.
2023-04-10Get DoF workingJonathan "Geenz" Goodman
Need to fix up bloom. DRTVWR-559 SL-19524 SL-19513
2023-03-31Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into ↵Jonathan "Geenz" Goodman
DRTVWR-559
2023-03-31Move glow extract to be after tonemapping.Jonathan "Geenz" Goodman
SL-19513
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 15:14:15 +0000