Commit Graph

103 Commits (d696010cea1dd0abf6821d6756bc1f33a955cb3f)

Author SHA1 Message Date
Cosmic Linden 6aa9110b2a secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools 2024-08-06 16:28:47 -07:00
Rye Mutt 7ebbc58ae3
Cache various frequently accessed settings (#2080) 2024-07-22 15:29:35 +03:00
Cosmic Linden fcf9af42fa secondlife/viewer#907: Review feedback 2024-06-13 12:49:48 -07:00
Brad Linden a1f49564d6 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
Brad Linden 3cb329d4fa Merge commit '29be88d60d654193926add496d2d851f7c217356' into project/gltf_development 2024-05-15 15:41:24 -07:00
Cosmic Linden ae6a402b7a secondlife/viewer#1474: Remove small texture offset from PBR terrain 2024-05-15 09:55:55 -07:00
Dave Parks d21f29b643
Merge branch 'project/gltf_development' into project/gltf_development 2024-05-14 14:22:46 -05:00
Cosmic Linden 9441608623 secondlife/viewer#907: Local PBR terrain texture transforms 2024-05-10 17:42:54 -07:00
Ansariel 799ebf2162 Fix broken merge and BOOL/bool issues 2024-05-10 15:16:06 +02:00
Andrey Lihatskiy 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
Cosmic Linden 47255bf44d secondlife/viewer#1184: Stop making terrain textures undeletable 2024-04-11 17:26:02 -07:00
Cosmic Linden ae46dc068e secondlife/viewer-issues#67: Fix Windows release build warning 2024-02-08 14:41:49 -08:00
Cosmic Linden 9c6e351e05 secondlife/viewer-issues#67: Improve PBR terrain loading robustness 2024-02-08 13:24:16 -08:00
Cosmic Linden 139c10dbeb secondlife/viewer#711: Add more options to drop textures from terrain, not yet used 2024-02-07 10:17:54 -08:00
Cosmic Linden 38b3f663fc Merge branch 'release/materials_featurette' of github.com:secondlife/viewer into DRTVWR-592 2024-01-22 15:07:10 -08:00
Cosmic Linden 42dafa5f09 SL-20606: Refactor model matrix code 2024-01-19 15:43:11 -08:00
Cosmic Linden db4bc52829 DRTVWR-592: (WIP) PBR Terrain: Improve orientation of textures and normal maps for triplanar mapping, minor cleanup 2023-10-13 10:39:34 -07:00
Cosmic Linden d6aced7abf DRTVWR-592: Remove WIP separate code path for terrain geometry rebuilds for PBR as that is not needed at the moment 2023-10-13 10:38:54 -07:00
Cosmic Linden 35d889f7af DRTVWR-592: Create separate config option for terrain repeats. Clean up debug 2023-10-13 10:38:48 -07:00
Cosmic Linden b9ba57fd00 DRTVWR-592: (WIP) Fix terrain PBR texture repeat seam. Legacy terrain texture repeats currently broken 2023-10-13 10:38:42 -07:00
Cosmic Linden 57433341ab Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin 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 2318d65766.
2023-10-13 10:36:51 -07:00
Cosmic Linden dfa19c5e43 DRTVWR-592: PBR terrain fallback for Mac/Intel: Drop emissive texture. Bump featuretable. 2023-10-13 10:33:16 -07:00
Cosmic Linden 2318d65766 Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin 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 de9184479c.
2023-10-13 10:31:51 -07:00
Cosmic Linden de9184479c DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin 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 2023-10-13 09:58:50 -07:00
Cosmic Linden 94d8f669ac DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture flickering 2023-10-13 09:58:13 -07:00
Cosmic Linden 039116abd4 DRTVWR-592: (WIP) Roughly working draft of PBR terrain 2023-10-13 09:58:05 -07:00
Cosmic Linden 5d046d8835 DRTVWR-592: (WIP) (does not work) PBR terrain rendering - compiles, but doesn't render properly just yet 2023-10-13 09:57:57 -07:00
Cosmic Linden 3553fec208 DRTVWR-592: (WIP) Separate code path for terrain rendering and shaders. Just copy/paste for now. Use same draw pool 2023-10-13 09:57:10 -07:00
Cosmic Linden 94e824739b DRTVWR-592: Render PBR material terrain like legacy, using baseColor texture 2023-10-13 09:57:02 -07:00
Cosmic Linden 76bf3390eb DRTVWR-592: (WIP) Detect when terrain materials are loaded, use as fallback when terrain textures do not load 2023-10-13 09:56:55 -07:00
Dave Parks 1c2410b8af SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code. 2023-02-03 19:45:31 -06:00
RunitaiLinden 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
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Dave Parks b6841d75c2 SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00
Ptolemy cfd39c3663 SL-16606: Add profiler category DRAWPOOL 2022-01-14 11:50:19 -08:00
Dave Houlton fab60f242e SL-16386 purge no-op fxn LLTexUnit::setTextureAlphaBlend() 2021-11-30 17:04:35 -07:00
Dave Houlton 3d1901dd4c SL-16386 purge no-op fxn LLTexUnit::setTextureColorBlend() 2021-11-30 17:04:35 -07:00
Dave Houlton 5fcea00c4f SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType() 2021-11-30 17:04:35 -07:00
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Dave Parks d2dce17803 SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead. 2021-10-19 02:26:41 +00:00
Andrey Lihatskiy 7a311fe30e Merge branch 'master' into DRTVWR-497 2020-04-20 21:21:12 +03:00
andreykproductengine 4f5d785226 SL-12014 Animesh is now a separate rendering type 2019-10-25 17:32:19 +03:00
Graham Linden e710dd2574 SL-11368
Force update of water fog color shader uniform to fix low/low+ application of water fog.
2019-06-05 15:31:39 -07:00
Graham Linden 6b92571194 SL-11020
Make terrain rendering re-assert wrapped tex sampling modes so shared
texture doesn't get that state stomped by other tex users.
2019-04-30 08:39:28 -07:00
Graham Linden e4bac71ac3 Fix shader link fail from forward decl of wrong soft clip func in class 1.
Fix trying to bind diffuse maps for shader without uniform in shadow shaders.

Clean up merge fail around mShaderLevel namechange.
2019-04-02 14:14:19 -07:00
Graham Linden d78ed764b5 Merge 6.1.2 LoveMeRender new hotness 2019-04-02 12:27:34 -07:00
Graham Linden 65927e0a76 SL-10181, SL-10546
Fix distortion map rendering in deferred mode not including underwater fog effects.

Fix distortion map rendering not including post-deferred content at all.

Fix distortion map rendering not including anything but sky when camera is underwater.

Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
2019-02-13 13:09:14 -08:00
Graham Linden 8890c3238a SL-10478
Fix side-effects of having both sun and moon as potential directional light contributors.
We pass an int to the shader indicating which to prefer instead of making per-pixel decisions
and pass the moonlight color/di independently.

Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
2019-02-06 16:42:23 -08:00
Graham Linden 04cb088458 SL-10381
Make deferred render use the same terrain texture boost hack as low.
2019-01-29 10:04:15 -08:00