Commit Graph

45192 Commits (d385c73b6e6df968a19a2bb7f0ec1e72bd01e8dc)

Author SHA1 Message Date
Michael Pohoreski d385c73b6e Merged in ptolemy_fix_fullbright_shiny (pull request #1011)
DRTVWR-559: Fix fullbrightShiny not compiling on AMD due to type mismatch

Approved-by: Dave Parks
2022-06-07 23:17:49 +00:00
Ptolemy 0837b65fdd DRTVWR-559: Fix fullbrightShiny not compiling on AMD due to type mismatch 2022-06-07 16:14:54 -07:00
Dave Parks a185fae28d SL-17285 Build fix take two. 2022-06-03 11:36:37 -05:00
Dave Parks 619fb2eed5 SL-17285 Build fix (coding policy needs last line to be blank). 2022-06-03 10:14:45 -05:00
Dave Parks 78f966b5db Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-06-02 18:43:06 -05:00
Dave Parks 220afbcda0 SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume 2022-06-02 18:42:38 -05:00
Euclid Linden 69aef3a806 Merged in DV559-merge-6.6.1 (pull request #997)
DRTVWR-559 merge up to release v6.6.1
2022-05-26 22:36:03 +00:00
Dave Houlton 78c6c341c5 Merge master v 6.6.1 into DRTVWR-559 2022-05-26 16:16:47 -06:00
Nat Goodspeed cdbd06e8ed Increment viewer version to 6.6.1
following promotion of DRTVWR-546
2022-05-25 19:22:09 -04:00
Dave Parks 3b3d3d88d1 SL-17287 Don't update reflection probes when PBR is disabled. 2022-05-24 11:38:23 -05:00
Dave Parks 0940e88718 SL-17472 Add checkbox to preferences for enabling "PBR" that uses "class3" deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions. 2022-05-24 10:34:47 -05:00
Dave Parks 6eaf8521ab SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render. 2022-05-20 19:05:28 -05:00
Dave Parks 6c6d9a10f8 SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation. 2022-05-20 13:31:18 -05:00
Dave Parks 096ad1306d SL-17286 Only update reflection probe UBO once per pipe flush 2022-05-19 22:36:03 -05:00
Dave Parks 3564b24e2a SL-17286 Reflection probe alpha/fullbright support. 2022-05-19 22:24:41 -05:00
Dave Parks 3365a39080 SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be). 2022-05-19 14:02:48 -05:00
Dave Parks 02fb1bd610 Make reflection probe ambiance controllable by a saved setting 2022-05-18 23:51:06 -05:00
Dave Parks 63878a60eb SL-17416 Box reflection probe influence volumes 2022-05-18 23:09:57 -05:00
Dave Parks bf183ecff7 SL-17449 Fix for Alexa's hair 2022-05-18 17:56:54 -05:00
Dave Parks c1deab5ba7 SL-17417 Fix for incorrect reflection orientation on fullbright prims. 2022-05-18 15:55:24 -05:00
Dave Parks 53c692c959 SL-17416 Quick 'n dirty reflection probe override hack. 2022-05-17 14:32:07 -05:00
Dave Parks a936322261 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-05-17 13:23:32 -05:00
Dave Parks 85b3f707d3 SL-17421 Fix for fullbright alpha mask shader ignoring vertex alpha 2022-05-17 13:23:08 -05:00
Andrey Kleshchev c6fe446c3a SL-17415 Movement of scripted attached objects is no longer interpolated. 2022-05-17 00:15:32 +03:00
Dave Parks c7ddba7eb4 SL-17417 Fix for incorrect reflection orientation on some moving child prims. 2022-05-16 16:02:38 -05:00
Dave Parks b2141e9446 Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559 2022-05-16 12:26:17 -05:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00:00
Andrey Lihatskiy 6309500557 SL-17356 Viewer changes for Premium Plus support 2022-05-11 21:05:46 +03:00
Andrey Kleshchev f0fa74fde7 SL-17376 Do not fail build if vcruntime140_1 is missing
If there is no vcruntime140_1 in the build system, it is likely that file is not required for the viewer to run.
2022-05-10 18:53:33 +03:00
Andrey Kleshchev c0adc5e181 SL-17376 Fix viewer failing due to missing vcruntime140_1 2022-05-09 21:22:22 +03:00
Andrey Kleshchev ca24fc11ea SL-17375 Crash at LLViewerOctreeEntry::getSpatialExtents()
access violation, 'this' was null
2022-05-06 20:55:41 +03:00
Brad Kittenbrink 6c1fdac9df Merged in brad/SL-17116-material-messaging (pull request #973)
brad/SL-17198 material assets

Approved-by: Euclid Linden
2022-05-06 17:16:56 +00:00
Brad Kittenbrink 6095a7d310 SL-17198 more fixes to get material asset serialization working better 2022-05-06 10:05:23 -07:00
Brad Kittenbrink 356817d2fc SL-17198 fixes to get material asset serialization working better 2022-05-06 10:02:47 -07:00
Michael Pohoreski af11b7fb9c Merged in SL-17274 (pull request #964)
SL-17274: Stub for PBR DrawPool and shader

Approved-by: Euclid Linden
Approved-by: Dave Parks
2022-05-06 16:49:44 +00:00
Ptolemy 663e121f2f SL-17274: Add debug rendering to pbr shader 2022-05-06 09:48:49 -07:00
Ptolemy 415380b140 SL-17274: Add vary_position, cleanup whitespace 2022-05-06 09:47:03 -07:00
Ptolemy 849e85dfd2 SL-17274: Fix diffuse color not being used in pbr shader 2022-05-06 09:44:23 -07:00
Brad Kittenbrink afe5d1f270 Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17116-material-messaging 2022-05-06 08:38:45 -07:00
Brad Kittenbrink (Brad Linden) c9be81a747 SL-17198 material asset uploading now suuceeeds. 2022-05-06 08:26:19 -07:00
Euclid Linden 8b74adc89b Merged in euclid-17325 (pull request #968)
SL-17325 apply inventory material to face
2022-05-05 21:39:20 +00:00
Dave Houlton cce5fdca84 SL-17325 apply inventory material to face 2022-05-05 15:38:16 -06:00
Andrey Kleshchev 43517c5adc SL-17244 Fix 'empty leaf' crashes 2022-05-05 19:41:56 +03:00
Brad Kittenbrink fa26abf901 Fix mac build for SL-17283 reflections work 2022-05-04 15:32:34 -07:00
Brad Kittenbrink 5ac6f13965 Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-05-04 14:47:52 -07:00
Andrey Kleshchev f3add82a4c Merge branch master (D550) into DRTVWR-546
# Conflicts:
#	indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
Dave Parks 93260cfeff SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps. 2022-05-04 16:07:50 +00:00
Nat Goodspeed bc7e2fb7e7 Increment viewer version to 6.5.6
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
Ptolemy 54919fa749 SL-17274: Stub for PBR DrawPool and shader 2022-05-02 10:16:54 -07:00
Dave Parks 1a6eee4ea2 SL-17321 Fix for some particle systems with custom blend functions not rendering. 2022-05-02 11:52:45 -05:00