Commit Graph

70042 Commits (f4182ddc7f7b7ee308f7edd378963b9b9cd2a2b4)

Author SHA1 Message Date
Ansariel f4182ddc7f Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
cosmic-linden 2020201ba6
Merge pull request #104 from secondlife/SL-19293
SL-19293: Use Blinn-Phong texture transform as hint for texture animation direction on PBR materials
2023-03-03 11:04:41 -08:00
cosmic-linden f92dddcf1f
Merge pull request #100 from secondlife/SL-19294
SL-19294: Fix Blinn-Phong texture transforms affecting PBR materials
2023-03-03 11:04:32 -08:00
Dave Parks 9464065503 Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-03-02 18:37:19 -06:00
Dave Parks 7139444461 SL-19281 Post review cleanup. 2023-03-02 18:36:57 -06:00
Cosmic Linden 69f9e41019 SL-19293: Use Blinn-Phong texture transform as hint for texture animation direction on PBR materials 2023-03-02 16:22:46 -08:00
Maxim Nikolenko e72e4250c5
SL-19316 fix filter for GLTF materials on mac (#101) 2023-03-03 00:38:46 +02:00
Cosmic Linden dc7ad02aa5 SL-19294: Avoid unnecessary vertex buffer data in GLTF materials 2023-03-02 14:37:16 -08:00
Dave Parks bc7856098f SL-19281 Unify handling of haze and gamma between fullbright and not and move haze back to sRGB color space to stay consistent with sky colors. Also fix broken "roughness" stuck at 0.2. 2023-03-02 16:36:03 -06:00
Cosmic Linden db44e06d66 SL-19294: Fix Blinn-Phong texture transforms affecting GLTF materials 2023-03-02 10:37:56 -08:00
Dave Parks 0982c44b46 Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-02-28 12:52:57 -06:00
Dave Parks e42d97d027 SL-18435 Rename texture tab combo box items and change "PBR" label on material swatch to "Material" 2023-02-28 12:52:38 -06:00
Brad Linden 3947bd13fd
Merge pull request #97 from secondlife/brad/DRTVWR-559
brad/drtvwr-559 mac shader and assert fixes
2023-02-28 10:33:37 -08:00
Dave Parks 9a024172da Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-02-28 12:08:46 -06:00
Dave Parks 36f37ebf8a SL-19263 Tidy up the reflection probe warning modal and add a cancel button. 2023-02-28 12:08:25 -06:00
cosmic-linden 4478decbe8
Merge pull request #96 from secondlife/SL-19729
SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms
2023-02-28 10:05:35 -08:00
Dave Parks d5e558fffc SL-19277 Fix for fallback probe sometimes getting occluded and making void water dark after teleport. Never default to having reflections off. 2023-02-28 08:49:15 -06:00
Brad Linden 78e7ada94b Mac shader and assertion fixes for DRTVWR-559 2023-02-27 17:35:24 -08:00
Cosmic Linden b27c41578b SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms 2023-02-27 15:57:45 -08:00
Dave Parks e5a2f85005 SL-19226 Reimplement water fresnel offset/scale, exposure balance for midday, adjust reflections off, and decruft depth buffer error correction shenanigans that are no longer used. 2023-02-27 16:53:56 -06:00
Dave Parks 099fe4a70a Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-02-27 13:26:56 -06:00
Dave Parks 41e694c33e DRTVWR-559 Fix for local lights being applied to fullbright objects. 2023-02-27 13:26:33 -06:00
cosmic-linden 9601abba55
Merge pull request #92 from secondlife/SL-19262
SL-19265: Fix precision issue with texture transforms, separate texture animations
2023-02-27 10:16:48 -08:00
Dave Parks 4ec8844f01 DRTVWR-559 Fix for occlusion culling going off the rails when settings change -- remove LLPipeline::resetVertexBuffers and add a sanity check to how long we wait for a query to be "available". 2023-02-27 10:42:53 -06:00
Dave Parks 61a6054e3a DRTVWR-559 Fix for mac build 2023-02-27 10:09:06 -06:00
Jonathan "Geenz" Goodman 46b2c0660a Hammering on more mac optimizations.
SL-18563
2023-02-25 22:24:46 -08:00
Cosmic Linden 7a533f3682 SL-19269: For PBR materials, apply texture animation independently of the underlying texture transform 2023-02-24 18:10:49 -08:00
Dave Parks b0fb4e3b7c DRTVWR-559 Fix for ignoring specular channel alpha for attenuation environment intensity. 2023-02-24 19:36:45 -06:00
Cosmic Linden 33085b9d83 SL-19265: Fix precision issue with texture transforms by moving transform matrix calculation into the shader 2023-02-24 13:53:55 -08:00
Dave Parks 9606f2afbb DRTVWR-559 Add controls for tonemapper to advanced preferences. 2023-02-24 15:41:51 -06:00
Dave Parks 2bbbb8fe87 Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-02-24 14:54:37 -06:00
Dave Parks 86427ec145 SL-19212 Resurrect glare and apply to PBR materials as well (and fix color mismatch in legacy alpha vs opaque). 2023-02-24 14:54:25 -06:00
cosmic-linden 5aa568f3a2
Merge pull request #89 from secondlife/SL-19228
SL-19228: Fix GLTF texture transform rotation + add UV debug
2023-02-24 11:41:04 -08:00
Cosmic Linden a7ecfc9b19 SL-19228: Remove DEBUG_TEXCOORD 2023-02-24 09:27:19 -08:00
Cosmic Linden 6494eed242 SL-19228: Fix GLTF texture transform rotation and add UV debug (PBR only). See textureUtilV.glsl for UV coordinate comments 2023-02-23 14:28:42 -08:00
Dave Parks 63ae47d8fd SL-19236 Fix for HUDs not rendering when transparent water is disabled. 2023-02-23 15:19:56 -06:00
Dave Parks e5e94b5fa8 DRTVWR-559 Fix for irradiance maps going black at 128x128 radiance map resolution. Improve radiance map anti-aliasing and default to 128x128 everywhere. 2023-02-23 11:47:24 -06:00
Dave Parks 93a82d4b75 DRTVWR-559 Fix for mac build. 2023-02-22 11:23:13 -06:00
Dave Parks 65d69ce80d DRTVWR-559 Fix for stall in probe occlusion culling and fix for culled neighbors getting sampled (badly). 2023-02-22 11:01:18 -06:00
Dave Parks 0336c1a06d DRTVWR-559 Fix SSR on transparent PBR surfaces. 2023-02-21 22:13:08 -06:00
Dave Parks 8f83724f7e DRTVWR-559 WIP -- Kill debug text on probes (whoops) 2023-02-21 20:56:20 -06:00
Dave Parks 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
Dave Parks 131d116ffd SL-19239 Day after three day quality pass - add ACES tone mapping to address "haziness" (and also fix banding in emissive materials) 2023-02-21 15:40:20 -06:00
Dave Parks cd0944caa6 SL-19239 Redo integration of Sascha's radiance map filter. 2023-02-17 14:55:06 -06:00
Dave Parks a91c970e3e Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559 2023-02-17 10:34:41 -06:00
Dave Parks 50c57b6be7 SL-19128 Soften the transition between manual and automatic sphere probes. 2023-02-17 10:34:27 -06:00
Ansariel 49a761189e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-17 13:58:10 +01:00
Andrey Kleshchev 17d3f37863 SL-17640 Fix 'Apply now' being enabled when importing 2023-02-16 22:51:29 +02:00
Brad Linden 5baee50c65
Merge pull request #84 from secondlife/SL-19191
Fix for crash on startup for M1 macs
2023-02-16 09:43:59 -08:00
Zi Ree 79c9873cd0 Linux: Pull in Alchemy's vertex cache optimizer fix to smooth out triangle soup in certain hair/tails - Thank you! 2023-02-16 17:46:43 +01:00