7e7e19ee35
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/pipeline.cpp
2025-02-07 19:38:29 +01:00
93a88e6025
Water Exclusion Surfaces ( #3517 )
...
* #3455 Add support for water exclusion surfaces
2025-02-07 05:55:47 -05:00
98510a3762
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-09-19 21:58:28 +02:00
705048ed5c
FIRE-34518 attempt to trap access violation bugsplat in pushBatch
...
Can't tell from splats whether the mVertexBuffer is null or just invalid. we may need to look elsewhere to manage the vertexbuffer lifetime properly.
2024-09-19 11:47:12 +01:00
2c4fe4ff45
secondlife/viewer#2349: Avatar/animesh rendering correctness pass ( #2364 )
...
* secondlife/viewer#2349 : Blinn-Phong avatar/animesh rendering optimization/correctness pass
* secondlife/viewer#2349 : General avatar/animesh rendering optimization/correctness pass
2024-08-22 13:45:14 -05:00
718189085a
viewer#1730 Crash in LLFetchedGLTFMaterial::bind
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
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
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
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
42dafa5f09
SL-20606: Refactor model matrix code
2024-01-19 15:43:11 -08:00
7c2c49dd26
SL-20606: Make push GLTF single batch static
2024-01-19 15:43:11 -08:00
68875523e0
SL-20611 Incorporate water haze into new post effect atmospherics goodness
2023-11-30 12:01:45 -06:00
c85bb7846d
DRTVWR-559 Fix for shadows not respecting double sided on opaque PBR surfaces
2023-07-19 12:52:36 -05:00
cae8aa6ecf
SL-19726 Fix for llTargetOmega on child prim breaking shadow rendering. Incidental decruft.
2023-05-18 18:03:17 -05:00
334d71e910
SL-19656 Rewrite avatar and attachment render metrics to not interfere with render pipe and be representative of actual render cost instead of driver synchronization time.
...
* SL-19656 Rewrite avatar and attachment render metrics to not interfere with render pipe and be representative of actual render cost instead of driver synchronization time.
* SL-19656 Remove now dead code (trackAttachments et al).
* SL-19656 Fix for crash on GL <= 3.2
2023-05-01 17:05:09 -05:00
51318d1808
SL-19644: Bind the shader on every shadow alpha blend call
2023-04-28 10:36:29 -07:00
6b83fabf72
SL-19644: Move GLTF transform reset out of pushBatch
2023-04-28 10:36:26 -07:00
e2dc40a76e
SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 merge
2023-04-26 17:19:29 -07:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
9f3f23ffa2
Temporarily moving new DRTVWR-559 LLDrawPool functions to someplace less likely to conflict with upcoming DRTVWR-539 merge
2023-04-26 14:35:27 -07:00
005a5fa207
SL-19606: Fix missing GLTF texture transforms in PBR alpha mask/alpha blend shadows
2023-04-21 15:10:05 -07:00
95d07ccd87
SL-19598: Fix shadows not having textures for PBR/non-rigged/alpha blended prims
2023-04-20 11:23:44 -07:00
19f7497d9a
DRTVWR-559 WIP -- occlusion culling for reflection probes -- has a defect for objects close to the camera at some angles and leaks query objects, will follow up.
2023-02-21 20:42:25 -06:00
9630a1a2bc
SL-18568 Fix for only one projector casting shadows.
2023-02-15 09:51:19 -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
93b1da52f5
SL-18908 Make media texture override base color and emissive texture on PBR materials when present.
2023-02-02 14:35:09 -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
a710bf9067
SL-18869 Optimizations -- Use _mm_prefetch to cut down on cache misses when iterating over render batches.
2023-01-09 15:18:57 -06:00
d27d23ab26
SL-18852 Refactor GLTF material rendering to not be special compared to other types. Hook GLTF alpha masking up to highlight transparent.
2022-12-16 11:12:06 -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
8155361355
SL-18453 WIP -- Use GLTF draw pool to render shadows. Still need a GLTF specific shadow shader to multiply alpha.
2022-10-28 11:19:43 -05:00
07bca31e06
SL-18190 Fix alpha not playing nice with water surface by split LLDrawPoolAlpha into two passes, one above water, one below water, and clip against water plane. Currently brute forces two complete alpha passes, still need to cull against water plane and add support for fullbright shaders.
2022-10-10 18:53:43 -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
1e72e3d82c
SL-18190 Remove some commented out code.
2022-10-04 12:21:25 -05:00
b66f2e7da7
SL-18202 WIP merging autotune contribution and updating UI
2022-09-21 21:19:17 +03:00
2ce39f3ad9
SL-17701 Fix for shadow passes not respecting double sided and alpha parameters for PBR materials.
2022-09-14 16:24:20 -05:00
54919fa749
SL-17274: Stub for PBR DrawPool and shader
2022-05-02 10:16:54 -07:00
e20aafa2fe
SL-16907 Crash at updateSkinInfoMatrixPalette #2
2022-04-07 14:17:30 +03:00
da6635702a
SL-16907 Crash at updateSkinInfoMatrixPalette
...
When animesh stops being an animesh it might still be in a list, but will no longer have an avatar
2022-03-17 17:18:05 +02:00
cfd39c3663
SL-16606: Add profiler category DRAWPOOL
2022-01-14 11:50:19 -08:00
dd03246735
SL-16478 Fix for octree and render batch debug display not working with rigged meshes.
2021-12-17 09:26:44 -06:00
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
6a0b728bd9
SL-16166 Optimize LLDrawPoolMaterials::pushBatch
2021-10-13 13:49:24 -05:00
a1e6cbe4a8
SL-16166 Apply LLRenderPass::pushBatch optimizations to LLDrawPoolBump::pushBatch
2021-10-13 10:35:39 -05:00
52e1a45659
SL-16166 Optimization pass on LLRenderPass::pushBatch
2021-10-12 14:46:19 -05:00
Ansariel