summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolterrain.cpp
AgeCommit message (Collapse)Author
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-06-13secondlife/viewer#907: Review feedbackCosmic Linden
2024-06-11Merge tag '7.1.8-release'Erik Kundiman
source for viewer 7.1.8.9375512768
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-05-15Merge commit '29be88d60d654193926add496d2d851f7c217356' into ↵Brad Linden
project/gltf_development
2024-05-16Merge branch 'release/materials_featurette' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15secondlife/viewer#1474: Remove small texture offset from PBR terrainCosmic Linden
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-14Merge branch 'project/gltf_development' into project/gltf_developmentDave Parks
2024-05-10secondlife/viewer#907: Local PBR terrain texture transformsCosmic Linden
2024-05-10Fix broken merge and BOOL/bool issuesAnsariel
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-04-11secondlife/viewer#1184: Stop making terrain textures undeletableCosmic Linden
2024-02-08secondlife/viewer-issues#67: Fix Windows release build warningCosmic Linden
2024-02-08secondlife/viewer-issues#67: Improve PBR terrain loading robustnessCosmic Linden
2024-02-07secondlife/viewer#711: Add more options to drop textures from terrain, not ↵Cosmic Linden
yet used
2024-01-22Merge branch 'release/materials_featurette' of github.com:secondlife/viewer ↵Cosmic Linden
into DRTVWR-592
2024-01-19SL-20606: Refactor model matrix codeCosmic Linden
2023-10-13DRTVWR-592: (WIP) PBR Terrain: Improve orientation of textures and normal ↵Cosmic Linden
maps for triplanar mapping, minor cleanup
2023-10-13DRTVWR-592: Remove WIP separate code path for terrain geometry rebuilds for ↵Cosmic Linden
PBR as that is not needed at the moment
2023-10-13DRTVWR-592: Create separate config option for terrain repeats. Clean up debugCosmic Linden
2023-10-13DRTVWR-592: (WIP) Fix terrain PBR texture repeat seam. Legacy terrain ↵Cosmic Linden
texture repeats currently broken
2023-10-13Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin ↵Cosmic Linden
hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing"" This reverts commit 2318d657660320b921e1566b54d3833c0401a34c.
2023-10-13DRTVWR-592: PBR terrain fallback for Mac/Intel: Drop emissive texture. Bump ↵Cosmic Linden
featuretable.
2023-10-13Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up ↵Cosmic Linden
code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing" This reverts commit de9184479cfc179ba6e9d6ff388aff7da7f0b4ab.
2023-10-13DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for ↵Cosmic Linden
PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing
2023-10-13DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture ↵Cosmic Linden
flickering
2023-10-13DRTVWR-592: (WIP) Roughly working draft of PBR terrainCosmic Linden
2023-10-13DRTVWR-592: (WIP) (does not work) PBR terrain rendering - compiles, but ↵Cosmic Linden
doesn't render properly just yet
2023-10-13DRTVWR-592: (WIP) Separate code path for terrain rendering and shaders. Just ↵Cosmic Linden
copy/paste for now. Use same draw pool
2023-10-13DRTVWR-592: Render PBR material terrain like legacy, using baseColor textureCosmic Linden
2023-10-13DRTVWR-592: (WIP) Detect when terrain materials are loaded, use as fallback ↵Cosmic Linden
when terrain textures do not load
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-10Preprocess non portable OpenGL codeErik Kundiman
2023-02-03SL-19148 Decruft followthrough -- decruft shader tree and some remaining ↵Dave Parks
forward rendering code.
2023-01-19Optimizations, decruft, and intel compatibility pass (#53)RunitaiLinden
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
2022-01-14SL-16606: Add profiler category DRAWPOOLPtolemy
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-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-19SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument ↵Dave Parks
LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-06-05SL-11368Graham Linden
Force update of water fog color shader uniform to fix low/low+ application of water fog.
2019-04-30SL-11020Graham Linden
Make terrain rendering re-assert wrapped tex sampling modes so shared texture doesn't get that state stomped by other tex users.