summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwater.cpp
AgeCommit message (Collapse)Author
2024-06-10Fix incorrect use of VX/VY/VZ/VW indices when color components are accessedAnsariel
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-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-21Convert remaining BOOL to boolAnsariel
2023-12-11SL-20611 Followup -- fix for artifacts on water surface from GPUs that don't ↵Dave Parks
like to read from a depth buffer that is bound for writing
2023-02-03SL-19148 Decruft followthrough -- decruft shader tree and some remaining ↵Dave Parks
forward rendering code.
2023-02-01SL-19124 Fix for broken distortion map in water in reflection probes.Dave Parks
2023-01-24SL-18958 Fix for broken water distortion map and depth buffer. Incidental ↵Dave Parks
decruft.
2023-01-19Optimizations, decruft, and intel compatibility pass (#53)RunitaiLinden
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-09SL-18869 Optimizations -- Decruftify LLRenderTarget, use a shader to copy ↵Dave Parks
color/depth instead of glCopyTexSubImage or glBlitFrameBuffer
2022-12-13SL-18808 Fix for highlight transparent texture missing.Dave Parks
2022-12-06SL-18788 Fix for legacy shiny not working until after restart when ↵Dave Parks
reflections probes are disabled.
2022-11-28Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559Brad Kittenbrink
2022-10-12SL-18190 Remove water reflection detail combo box and reimplement ↵Dave Parks
"Transparent Water" checkbox.
2022-10-11SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), ↵Dave Parks
remove some unused glsl files.
2022-10-06SL-18190 Water shader WIP. Better parallax correction for sphere probes. ↵Dave Parks
Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-05SL-18190 WIP - Add refraction to water without splitting scene between above ↵Dave Parks
and below water
2022-10-04SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still ↵Dave Parks
busted). WIP on reflection probe/PBR driven water shader.
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-05-26Merge branch 'master' v 6.6.1 into DRTVWR-528Dave Houlton
2022-04-19Restored SL-15400, it got lost in an automatic mergeAndrey Kleshchev
Pausing clouds should not pause water
2022-04-18Merge branch 'master' into DRTVWR-528Dave Houlton
2022-03-07SL-15861: Fix inconsistent additive light spanning 180 degrees for water ↵Ptolemy
angles in Mid quality.
2022-01-28SL-16722 Fix void water not being rendered due to PR 782 skipping second ↵Ptolemy
pass of water rendering
2022-01-14SL-16606: Add profiler category DRAWPOOLPtolemy
2021-12-09SL-16461 disable occlusion-based reflection updateDave Houlton
2021-11-30SL-16386 purge no-op fxn LLTexUnit::setTextureAlphaBlend()Dave Houlton
2021-11-30SL-16386 purge no-op fxn LLTexUnit::setTextureColorBlend()Dave Houlton
2021-11-30SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()Dave Houlton
2021-11-30SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunctionDave Houlton
2021-11-22SL-13565 refactor (consolidate getters) water drawingDave Houlton
2021-11-22SL-13565 disable reflection render pass when all non-void water is occludedDave Houlton
2021-11-12DRTVWR-528 Reverting multiple commits due to moving them into D546 branchAndrey Kleshchev
This reverts commits 9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933 53c0144dd272470172591b967a84beaa4019b728 SL-11687 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056 b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391 921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561 639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
2021-11-12SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2021-11-04SL-13565 occlusion/reflection tracy markupDave Houlton
2021-09-15SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2021-06-30SL-15400 Menu item "Pause Clouds" should not pause waterAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-08-13SL-11212Graham Linden
Calculate sunAngle2 correctly given light dir in new coord space.
2019-08-12SL-10566, SL-10677Graham Linden
Make sky updates only occur if the input atmospherics values have actually changed (perf optimization). Make water rendering use specular color for coloring spec.
2019-06-06SL-11367Graham Linden
Use rotated lightnorm directly in water shader instead of forcing all shaders marked as water (including lighting) to get that norm (where it would only affect Mid as only that graphics mode has atmospherics on but isn't using deferred rendering).
2019-05-17SL-11112Graham Linden
Fix blend between reflected/refracted water maps (make less transparent) and fix setting of water fog color alpha on low end to better match prev behavior of setting the internal control value in that case.
2019-03-19SL-10763Graham Linden
Fix broken logic for alpha drawpool when rendering with basic shaders off. Force unbind of 2nd tex unit that we use during water rendering.
2019-03-05Don't rebuild reflection when only edge water patches are in play.Graham Linden
Use (Restore)TexSetup for tex binding (should be equivalent now). Simplify uniform management in alpha drawpool loop. Fix wrong modelview mat being used for distortion map gen.
2019-03-03SL-10664, SL-10666Graham Linden
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly. Baseline for performance work.
2019-02-28EEP performance WIPGraham Linden
Mods to improve alpha obj render performance. Removes hacky fix for HUD elements getting atmospherics. Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding. Fix up default classes and basic shader loading (remove unused shared modules).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 00:38:43 +0000