892628c7f3
Quick fix for null pointer in LLDrawPoolWater
2025-02-23 12:54:50 -05:00
d450295cf5
Additional water fixes and tweaks. ( #3524 )
...
* Incorporation of feedback for #3456
2025-02-11 13:49:24 -05:00
93a88e6025
Water Exclusion Surfaces ( #3517 )
...
* #3455 Add support for water exclusion surfaces
2025-02-07 05:55:47 -05:00
212b1edd2d
Fix trying to bind to non-existent texunit sampler during water draw ( #2128 )
2024-08-01 22:50:23 +03:00
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
4b52dd754b
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
2024-06-10 19:30:17 +03: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
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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
f3b8714577
SL-20611 Followup -- fix for artifacts on water surface from GPUs that don't like to read from a depth buffer that is bound for writing
2023-12-11 15:28:25 -06:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
715252e3fd
SL-19124 Fix for broken distortion map in water in reflection probes.
2023-02-01 10:32:08 -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
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
20c578b7ae
SL-18808 Fix for highlight transparent texture missing.
2022-12-13 11:40:14 -06:00
03da83f235
SL-18788 Fix for legacy shiny not working until after restart when reflections probes are disabled.
2022-12-06 10:18:46 -06:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
42ec639c86
SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox.
2022-10-12 14:46:51 -05: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
9448db5d4a
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-06 18:40:01 -05:00
30bcc7d6d5
SL-18190 WIP - Add refraction to water without splitting scene between above and below water
2022-10-05 08:11:33 -05:00
1900df3615
SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still busted). WIP on reflection probe/PBR driven water shader.
2022-10-04 12:20:19 -05:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
e0c4304e4a
Restored SL-15400, it got lost in an automatic merge
...
Pausing clouds should not pause water
2022-04-19 21:15:58 +03:00
035b1996df
Merge branch 'master' into DRTVWR-528
2022-04-18 15:35:23 -06:00
d7bb4cdc8d
SL-15861: Fix inconsistent additive light spanning 180 degrees for water angles in Mid quality.
2022-03-07 09:32:17 -08:00
d38a273014
SL-16722 Fix void water not being rendered due to PR 782 skipping second pass of water rendering
2022-01-28 18:05:18 -08:00
cfd39c3663
SL-16606: Add profiler category DRAWPOOL
2022-01-14 11:50:19 -08:00
d718f25f7d
SL-16461 disable occlusion-based reflection update
2021-12-09 10:50:50 -07:00
fab60f242e
SL-16386 purge no-op fxn LLTexUnit::setTextureAlphaBlend()
2021-11-30 17:04:35 -07:00
3d1901dd4c
SL-16386 purge no-op fxn LLTexUnit::setTextureColorBlend()
2021-11-30 17:04:35 -07:00
5fcea00c4f
SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
100f53dd5a
SL-13565 refactor (consolidate getters) water drawing
2021-11-22 15:22:29 -07:00
bb379cb8cc
SL-13565 disable reflection render pass when all non-void water is occluded
2021-11-22 15:22:28 -07:00
7ce17542d4
DRTVWR-528 Reverting multiple commits due to moving them into D546 branch
...
This reverts commits
9b5b2eac8253c0144dd2492ea7c3a0b854eceee3921c3f5f69639acb6ff7
2021-11-12 17:44:40 +02:00
709184e0ff
SL-15993 Disabling transparent water should not disable advanced lighting
2021-11-12 17:34:27 +02:00
5e9351a41a
SL-13565 occlusion/reflection tracy markup
2021-11-04 16:19:18 -06:00
9b5b2eac82
SL-15993 Disabling transparent water should not disable advanced lighting
2021-09-15 20:04:36 +03:00
6a3e775dbb
SL-15400 Menu item "Pause Clouds" should not pause water
2021-06-30 22:14:45 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
812e6285c5
SL-12007 Toggling 'Transparent water' checkbox has no effect
...
Opaque water is not compatible with ALM
2020-05-13 21:48:36 +03:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
fac181b179
SL-11212
...
Calculate sunAngle2 correctly given light dir in new coord space.
2019-08-13 08:39:55 -07:00
5937a42224
SL-10566, SL-10677
...
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-08-12 14:25:35 -07:00
158a0104c1
SL-11367
...
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-06-06 15:55:50 -07:00
Jonathan "Geenz" Goodman