Commit Graph

120 Commits (8d7d75d1a8d48c2fc4f19f2267ca7104f682aaa7)

Author SHA1 Message Date
Zi Ree 0e9caac326 gcc 11.1 warning - array overrun in assignment of LLColor3 to LLVector4 2022-08-01 15:48:23 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
Ptolemy 97552d2e75 SL-16606: Add profiler category SHADER 2022-01-14 11:50:20 -08:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
Ptolemy cfd39c3663 SL-16606: Add profiler category DRAWPOOL 2022-01-14 11:50:19 -08:00
Andrey Lihatskiy 970b6661cd Merge branch 'master' into DRTVWR-543-maint 2021-12-26 14:01:17 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Ptolemy 1be8a8d10b Fix merge conflict 2021-10-29 15:11:42 -07: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 Kleshchev c990a6a82d SL-11793 Fallback for 'Day' preset importing 2021-09-20 22:21:56 +03:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
2021-03-08 13:56:16 +00:00
Callum Prentice 354930014b Merge with tip of Release 2020-09-28 15:56:44 -07:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 2e6f516411 Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more 2020-09-16 21:12:53 -07:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. 2020-09-16 18:53:24 -07:00
Dave Houlton 9f0da75332 Merge branch 'master' 6.4.8 into DRTVWR-497 2020-08-18 11:29:17 -06:00
Nicky Dasmijn acaa272330 LLExtStat had been a S32, this wasn't right, as some of the constants lead to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this.
LLExtStatus needs to be at least of type U32 to remedy this problem, but
while at it it makes sense to turn it into what it is: An enum. Turning
it into a class enum has the added benefit we get type safety for mostly
free.
Which incidentally turned up a problem right away:
A call to removeAndCallbackPendingDownloads had status and extstatus
reversed and thus was wrong.
2020-07-22 06:48:15 +03:00
Dave Houlton ea9afd6600 SL-13084 Combined commit for the EEP specular color fix
SL-13084: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll

SL-13804: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll

SL-13084: Fix inverted cloud scroll with ALM is off

SL-13084: Move texture coords section to top in class2/windlight/cloudsV to match class1/deffered/cloudsV

SL-13084: Add references to other common files
2020-06-13 08:31:01 +03:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Dave Houlton 4ec3168715 SL-11606 final tweak of non-ALM lights strength 2019-12-20 10:29:46 -07:00
Dave Houlton b3e11083cc SL-11606 fix to match EEP light falloff vs release 2019-12-19 18:04:32 -07:00
Graham Linden ad26896a10 SL-11055
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
2019-08-27 12:49:18 -07:00
Rider Linden 1f656735d3 SL-11705, SL-11706: New flags in llsettings base for tracking by simulator. 2019-08-26 11:43:45 -07:00
Graham Linden b507d63566 SL-11621
Remove all references to unused shader var global_gamma.

Remove many unused decls for gamma from shaders.

Make post-deferred gamma correction use display_gamma.

Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
2019-07-23 11:36:22 -07:00
Graham Linden 158a0104c1 SL-11367
Use rotated lightnorm directly in water shader instead of forcing all shaders marked as water (including lighting) to get that norm
(where it would only affect Mid as only that graphics mode has atmospherics on but isn't using deferred rendering).
2019-06-06 15:55:50 -07:00
Graham Linden 5ad28c1f15 Merge 2019-05-29 08:14:24 -07:00
Graham Linden 5d844d2646 SL-11247
Fix underwater water fog density modifier being used when not underwater.
2019-05-29 08:12:49 -07:00
andreykproductengine 6aa393f7f5 SL-11287 [EEP] Importing certain legacy windlights give upload error 2019-05-24 21:17:41 +03:00
Graham Linden e9dbee0026 SL-11238
Fix ambient light inputs to the renderer.

Fix 3rd sky shader w/ mistaken density mod conversion.

Make ambient clamp apply to all modes.

Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
Graham Linden c8ae0c0c3f SL-11112
Fix blend between reflected/refracted water maps (make less transparent)
and fix setting of water fog color alpha on low end to better match
prev behavior of setting the internal control value in that case.
2019-05-17 14:21:52 -07:00
Rider Linden 61c2f820b4 SL-11008: Do not adjust imported windlight density and distance multipliers. 2019-05-09 14:16:01 -07:00
Graham Linden 6d13430d78 Make sure cloud_color has non-garbage alpha (no offense to 4.59e-41). 2019-05-03 10:33:30 -07:00
Graham Linden c4032528af Roll back sRGB decode changes from contrib for now.
Fix direct light matching across alpha/blended-material/deferred.

Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
Graham Linden 2c568e7584 SL-10925, SL-10926, SL-10896
New fix for 925/926 that doesn't cause 896 again.

Also linearize moon disc tex color.
2019-04-10 10:11:50 -07:00
Graham Linden a50590ec4b SL-10925, SL-10926
Restore letting env auto-update sunlight_color uniform (other shaders expect it even if lighting does not).
2019-04-09 10:40:49 -07:00
Graham Linden 759525040a SL-10912
Fix conversion of star brightness, density mult, and distance mult to legacy ranges.

Make settings look in both legacyhaze and top-level settings for haze params.
2019-04-08 13:07:44 -07:00
Graham Linden fe589170d3 SL-10896
Fix deferred water soften prog lightnorm getting stomped with rotated lightnorm,
because it's a water shader and needs water atmo uniform values,
but it's a deferred lighting shader that needs not-so-rotated lightnorms.

Make sunlight_color not get auto-updated so we can get the correct value from mSunDiffuse.

Remove mix to preserve bumps as it was washing out shadows.
2019-04-05 15:54:21 -07:00
Rider Linden 2401712d10 SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions. 2019-02-20 15:20:30 -08: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
Rider Linden c7e02b0835 SL-9925: Viewer now shows an error message if import from legacy windlight fails. 2019-01-30 14:36:46 -08:00
Graham Linden e13113ab0b SL-10305 fix post deferred gamma correction to address ALM mismatch with non-ALM lighting. 2019-01-08 13:15:00 -08:00
maxim_productengine dfe9a02a9b SL-10274 FIXED [EEP] Settings object created by Save As cannot be copied from an object 2018-12-20 16:09:10 +02:00
andreykproductengine 25e0465944 SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button 2018-10-31 15:57:19 +02:00
Graham Linden fb335cc243 SL-10000 fix storing of ambient value when converting legacy settings 2018-11-01 18:26:24 +01:00
andreykproductengine 659d14504f SL-1476 EEP Better shader resets and transitions 2018-10-29 18:18:20 +02:00
Graham Linden 0532c644a3 Merge 2018-10-19 16:58:52 +01:00
Graham Linden 3447621a15 Port sim-side changes to back-conversion of new settings to legacy.
Fix validating of density multiplier to clamp >= 0.0001f.

Port fix to setter for ambient color in sky settings.
2018-10-18 21:18:40 +01:00
Rider Linden 6cdcc7fe2e SL-9889: New reconverted default assets 2018-10-17 12:16:24 -07:00
maxim_productengine a639642c21 SL-9853 FIXED [EEP] Default Settings object cannot be copied by other users. 2018-10-17 17:50:56 +03:00