Commit Graph

46265 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Howard Stearns 88e1740d20 SL-17967 - block layout binding acceptable to apple 2022-09-01 16:18:14 -07:00
Drake Arconis e15982eb55 Merged in rye-refprobefixes (pull request #1119)
Use an SRGB buffer for initial reflection map capture for proper linear sampling
2022-09-01 23:13:14 +00:00
Dave Parks e0c226b04d SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal maps, fix for crash on shutdown. 2022-09-01 18:06:15 -05:00
Rye Mutt ef98be881c Use an SRGB buffer for initial reflection map capture for proper linear sampling
Fix irradiance gen up vector to be properly normalized
2022-09-01 17:30:48 -04:00
Howard Stearns 3cf349c4fa Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967 2022-09-01 13:38:59 -07:00
Howard Stearns 01d03edd85 SL-17967 - _ARB constant removal 2022-09-01 13:38:22 -07:00
Howard Stearns 2082443220 SL-17967 - Git rid of ARB that is in core 2022-09-01 10:58:27 -07:00
Brad Payne (Vir Linden) 3c3442cbbc Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-09-01 15:12:14 +01:00
Brad Payne (Vir Linden) 2c692f635d DRTVWR-559 refcount max change 2022-09-01 15:11:56 +01:00
Andrey Kleshchev d2d257cfa9 SL-17653 Fix combo not being visible when needed 2022-09-01 16:05:01 +03:00
Andrey Kleshchev 116bd660b6 SL-17653 Finalized texure picker's local filtering 2022-09-01 13:26:11 +03:00
Andrey Kleshchev 20dc30450c SL-17999 PBR material in tool's texture tab 2022-09-01 13:26:10 +03:00
Andrey Kleshchev 8df1856f84 SL-17653 In texture picker cleaned up permanently invisible 'show folders' checkbox 2022-09-01 13:26:10 +03:00
Ptolemy ce685a12b9 DRTVWR-559: PBR: Cleanup distance attenuation calcs 2022-08-31 21:06:41 -07:00
Ptolemy 539fd5fcf9 SL-17975: PBR: Don't process point light if outside light radius 2022-08-31 21:04:45 -07:00
Ptolemy 17a957fe44 DRTVWR-559: PBR: Cleanup: Don't do redundant dot(n,l) calc 2022-08-31 21:00:58 -07:00
Ptolemy f4d7b11e16 SL-17975: PBR: Fix point light popping 2022-08-31 20:59:43 -07:00
Ptolemy eff9f08bd9 DRTVWR-559: PBR: Disable PBR bloom 2022-08-31 13:19:56 -07:00
Ptolemy 71115a7a27 SL-17703: Fix merge 2022-08-31 10:16:24 -07:00
Dave Parks 5c0e201cd6 SL-18065 WIP -- Clamp virtual size of fetched textures. 2022-08-31 11:45:48 -05:00
Dave Parks c9f893b100 SL-18065 WIP -- Adjust max virtual size to keep debug floater readable. Make assert on shutdown less frequent (still not gone, likely race condition). Fix unrelated assertion in reflection probes. 2022-08-31 11:36:00 -05:00
Ptolemy 8eaee1f033 SL-17703: PBR: Fix albedo being in wrong color space, add support for debug default_irradiance.png 2022-08-30 20:35:15 -07:00
Dave Parks e8002dc00f Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-08-30 16:43:20 -05:00
Dave Parks 47ecbca24d SL-17987 Fix for material editor not initializing to GLTF defaults when loading a null material asset. 2022-08-30 16:43:05 -05:00
Andrey Kleshchev d55a6308c2 SL-17984 The top two lines in the Description field are not available for selection
Viewer was drawing empty "indicator_stack" over description
2022-08-31 00:34:17 +03:00
Andrey Kleshchev d19d827121 Merge branch master (DRTVWR-483) into DRTVWR-559
# Conflicts:
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllocalbitmaps.h
#	indra/newview/llviewerregion.cpp
#            lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
Andrey Kleshchev fbccc0986d SL-17653 Clean up unneeded filepicker dependency. 2022-08-31 00:18:51 +03:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
2022-08-31 00:16:09 +03:00
Nat Goodspeed d31a83fb94 Increment viewer version to 6.6.4
following promotion of DRTVWR-483
2022-08-30 17:02:51 -04:00
Dave Parks 2158162b50 SL-18055 Fix for soft cube maps on chrome (don't clamp roughness value) 2022-08-30 15:46:38 -05:00
Dave Parks 03d012d46c SL-18038 Remove placeholder "save as material" button 2022-08-30 14:42:04 -05:00
Dave Parks e928e3fec4 SL-17705 AMD compatibility -- use a specific LoD of irradiance map to avoid black outlines on AMD 2022-08-30 13:57:46 -05:00
Howard Stearns 3b70c9d49c Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade 2022-08-30 10:20:15 -07:00
Dave Parks 197ac7cc20 Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 2022-08-30 10:46:36 -05:00
Dave Parks 14af7cabdb SL-17997 Fix for crash on shutdown 2022-08-30 10:32:09 -05:00
Ptolemy 302bf29242 Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559 2022-08-29 18:03:22 -07:00
Howard Stearns 6fbc733c97 SL-17967 - demonstrate what features are provided in various profiles 2022-08-29 18:00:43 -07:00
Ptolemy e81b149c4a Revert "SL-17703: PBR: Fix missing ORM to use 1,0,0"
If ORM is blank the roughness and metal are multiplied into a default white ORM texture.  This reverts commit 71ae65ae17.
2022-08-29 17:34:49 -07:00
Dave Parks d49e311a37 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-08-29 18:47:10 -05:00
Dave Parks 9c6b197b3e SL-18037 Workaround AMD driver bug (drop reflection probe count to 16 on amd) 2022-08-29 18:46:48 -05:00
Ptolemy 826bd47cc1 SL-17703: PBR: Fix default OMR if pbr shader compiled sans HAS_SPECULAR_MAP 2022-08-29 14:08:27 -07:00
Ptolemy 71ae65ae17 SL-17703: PBR: Fix missing ORM to use 1,0,0 2022-08-29 14:06:48 -07:00
Howard Stearns 6c4ff3f9c8 Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967 2022-08-29 10:17:09 -07:00
Ptolemy d6e8a6c98a SL-17703: PBR: revert dc8773ff, tweak sunlight albedo to be darker 2022-08-26 17:47:47 -07:00
Ptolemy dd3c13a198 SL-17766: PBR: Remove redundant misc. dot() calculations 2022-08-26 15:51:39 -07:00
Ptolemy 08c23419be DRTVWR-559: PBR: Cleanup 2022-08-26 15:31:30 -07:00
Ptolemy 55b071dcd7 DRTVWR-559: Cleanup: Preserve note about legacy dist_atten magic number 2022-08-26 15:19:48 -07:00
Ptolemy 8b45dfd477 DRTVWR-559: PBR: Cleanup debug 2022-08-26 15:19:03 -07:00
Ptolemy dc8773ffe9 SL-17703: PBR: Fix albedo being washed out due to wrong color space. 2022-08-26 15:09:02 -07:00
Howard Stearns 1b5c13fd44 Merge branch 'brad/opengl-core-profile-mac' of bitbucket.org:lindenlab/viewer into SL-17967 2022-08-26 09:50:08 -07:00