summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
AgeCommit message (Collapse)Author
2022-10-21SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make ↵Dave Parks
override messaging LLSD where it ought to be and JSON where it ought to be.
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-09-30SL-18239 Unify PBR and non-PBR treatment of ambient/SSAO/irradiance. ↵Dave Parks
Restore SSAO to release version.
2022-09-20SL-18190 Reduce banding (stay in linear space as much as possible, increase ↵Dave Parks
precision of reflection probes). Faster radiance and irradiance map generation.
2022-09-13SL-17701 WIP -- Cleanup/refactor PBR lighting implementation and get parity ↵Dave Parks
between deferred and alpha passes for sunlight and IBL.
2022-06-21SL-17274 Cleanup hard-coded gbuffer atmos flag for softenlightPtolemy
2022-06-06SL-17532 Potential fix for some rigged mesh draw order issues.Dave Parks
2022-05-24SL-17472 Add checkbox to preferences for enabling "PBR" that uses "class3" ↵Dave Parks
deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions.
2022-05-19SL-17286 Reflection probe alpha/fullbright support.Dave Parks
2021-11-12SL-14895, restore previous post-deferred alpha behaviorDave Houlton
2021-01-07SL-14035 revert incorrect removal of glarePtolemy
2021-01-06SL-14035: Incorporate patch from Sovereign Engineer to fix specular reflectionPtolemy
2020-06-18SL-13163 revert 2 more instances of 'new EEP' specular calculationDave Houlton
2020-04-07SL-10449 Fix ALM on OSXPtolemy
2020-03-24Merge cleanupRunitai Linden
2020-03-24Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/DRTVWR-440
2020-03-20WIP - Make EEP match production.Runitai Linden
2020-03-18SL-12865, add bias to alpha mask values to avoid 8-bit acneDave Houlton
2020-03-17SL-10449 remove soft gamma adjustment that breaks Mac GLSL compilerDave Houlton
2020-03-13SL-12784 disambiguate vertex_color.a of 0Dave Houlton
2020-03-13Merged in davep/DRTVWR-440 (pull request #33)Dave Parks
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
2020-03-13SL-12233 Fix for disagreement between fullbright implementations with ALM on ↵Runitai Linden
and off.
2020-03-12SL-12784 restore vertex color alpha contributionDave Houlton
2020-03-10SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanupPtolemy
2020-03-10SL-12592, avoid light modulation of fullbright and preserve diffuse alpha ↵Dave Houlton
component
2020-03-06Fix for mismatch on angular attenuation between sunlight on opaque and ↵Runitai Linden
transparent objects from last commit.
2020-03-05WIP - Windlight sun lighting should happen in sRGB space, not linear space. ↵Runitai Linden
This keeps ambient from getting overblown and better matches environment lighting with ALM on/off.
2020-03-05Reenable water fog in materialF.glsl (oops)Runitai Linden
2020-03-04Fix line endings?Runitai Linden
2020-03-04Merge fixRunitai Linden
2020-03-04Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/BUG-228263
2020-03-04WIP - fix various inconsistencies in sRGB vs linear color space. Fix ↵Runitai Linden
inconsistencies between softenLightF.glsl, materialF.glsl, and alphaF.glsl
2020-03-04Roll back SL-12006 commits to materialF.glsl (Dec23)Dave Houlton
2020-03-03Revert 2 merges (PR#13, PR#16) related to SL-12638Dave Houlton
This reverts commits 9d9b890 and 5f846e4.
2020-02-28SL-12638, further tweaking of normal-map lighting, add some de-saturationDave Houlton
2020-02-25SL-12638, fix overly dark appearance of normal-mapped objectsDave Houlton
Adds the 'additive' component of calcAtmosphericVars into the sunlit color to reduce darkening of sun lighting component, and adds a further magic number gainto boost final result to rough parity with windlight. Removes all light calculations on fullbright objects, just passing through the unlit diffuse color.
2020-02-07SL-12682, remove negative light & clean up materialF.glslDave Houlton
2020-02-07SL-12592, fix transparency for full-brightsDave Houlton
2020-01-29SL-11406: Fix specularity being blown out due to previous fixPtolemy
2020-01-10SL-12171: Fix for SL-12006 that made non-emissive portions of textures too dim.Ptolemy
2019-12-24Cleanup indentation and commented out debug color stage vectorsMichael Pohoreski (Ptolemy Linden)
2019-12-24De-tabifyMichael Pohoreski (Ptolemy Linden)
2019-12-23Fix SL-12006: Fullbright with specular map, Alpha Mode Emissive, and wrong ↵Michael Pohoreski (Ptolemy Linden)
Diffuse for Alpha Mode Blend
2019-12-23SL-12006 pre-checkinMichael Pohoreski (Ptolemy Linden)
2019-12-18Future-proof Full BrightMichael Pohoreski (Ptolemy Linden)
2019-12-17SL-12472 to address SL-11406Michael Pohoreski (Ptolemy Linden)
2019-12-10SL-11406: Skip avatars being effected.Michael Pohoreski (Ptolemy Linden)
2019-11-23Cleanup commentsMichael Pohoreski (Ptolemy Linden)
2019-11-21SL-11406 Fix fullbright to better match non-EEP. Minor optimization cleanup.Michael Pohoreski (Ptolemy Linden)
2019-10-29SL-10449 FIX [EEP] Fixed a (Mac-only) shader regression in changeset 41246Dave Houlton