Age | Commit message (Collapse) | Author |
|
|
|
and llunittype.h for now
|
|
|
|
|
|
# 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
|
|
LF, and trim trailing whitespaces as needed
|
|
|
|
like to read from a depth buffer that is bound for writing
|
|
forward rendering code.
|
|
|
|
decruft.
|
|
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
|
|
color/depth instead of glCopyTexSubImage or glBlitFrameBuffer
|
|
|
|
reflections probes are disabled.
|
|
|
|
"Transparent Water" checkbox.
|
|
remove some unused glsl files.
|
|
Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
|
|
and below water
|
|
busted). WIP on reflection probe/PBR driven water shader.
|
|
|
|
|
|
Pausing clouds should not pause water
|
|
|
|
angles in Mid quality.
|
|
pass of water rendering
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commits
9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933
53c0144dd272470172591b967a84beaa4019b728 SL-11687
492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056
b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391
921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561
639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
Opaque water is not compatible with ALM
|
|
|
|
|
|
Calculate sunAngle2 correctly given light dir in new coord space.
|
|
Make sky updates only occur if the input atmospherics values have actually changed (perf optimization).
Make water rendering use specular color for coloring spec.
|
|
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).
|
|
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.
|
|
Fix broken logic for alpha drawpool when rendering with basic shaders off.
Force unbind of 2nd tex unit that we use during water rendering.
|
|
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.
|