Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
49a0b75
First pass of porting (some UI work - not all) and porting the hlsl h…
FrancescoC-unity Sep 6, 2021
ac7619f
Before experiments.
FrancescoC-unity Sep 7, 2021
f356e7e
Broken, but need to switch branch.
FrancescoC-unity Sep 7, 2021
d261d06
wut
FrancescoC-unity Sep 16, 2021
513f1f0
Fix UX
FrancescoC-unity Sep 16, 2021
ed50353
Merge branch 'master' into HDRP/hdr-tv-support-2-electric-boogaloo
FrancescoC-unity Sep 16, 2021
23ee264
Fix error in BT2390
FrancescoC-unity Sep 17, 2021
62cbf4b
Fix UI shader in player.
FrancescoC-unity Sep 20, 2021
a1b771c
Sync point
FrancescoC-unity Sep 22, 2021
a6e7d7f
Correct UI composition.
FrancescoC-unity Sep 23, 2021
cc6dc5e
ACES workflow 1000nits
FrancescoC-unity Sep 24, 2021
f1ed59f
LUT workflow
FrancescoC-unity Sep 24, 2021
b2cc90a
Fix LUT behaviour.
FrancescoC-unity Sep 24, 2021
411f307
Fix final blit
FrancescoC-unity Sep 27, 2021
9e55936
Remove LUT debug switch, always debug
FrancescoC-unity Sep 27, 2021
f1ba317
scRGB support
FrancescoC-unity Sep 28, 2021
709dd89
Miss some files with previous commit
FrancescoC-unity Sep 28, 2021
f117357
Removing separate UI handling for now.
FrancescoC-unity Sep 28, 2021
c038fd8
Proper handling of after post process.
FrancescoC-unity Sep 28, 2021
461f4df
Move to tonemap volume component
FrancescoC-unity Sep 28, 2021
b6d5902
Cleanup and add ACES presets
FrancescoC-unity Sep 29, 2021
01e4a94
Rename test function
FrancescoC-unity Sep 29, 2021
acc3428
Small cleanup
FrancescoC-unity Sep 29, 2021
3f84e43
Fix issue with scRGB not being properly set.
FrancescoC-unity Sep 29, 2021
f9f98ba
Add some skeleton for debug (still not done) - fix issues in scene view.
FrancescoC-unity Sep 29, 2021
c6474b9
fix compile issue of the tmp setup
FrancescoC-unity Sep 29, 2021
1706997
Revert turning off.
FrancescoC-unity Sep 29, 2021
0d20f89
Fix scene view being off.
FrancescoC-unity Sep 29, 2021
93f92f6
Fix scene view.
FrancescoC-unity Sep 29, 2021
c690249
Gamut debug views
FrancescoC-unity Sep 30, 2021
5563e98
Fix aces grading being capped out.
FrancescoC-unity Sep 30, 2021
679fe2d
Finalize debug view
FrancescoC-unity Oct 1, 2021
61b5d81
Small cleanup
FrancescoC-unity Oct 1, 2021
7bb6fb5
Perform grading in ACEScg by default
FrancescoC-unity Oct 1, 2021
06939e0
fix issues with debugs
FrancescoC-unity Oct 1, 2021
dac0d38
Only UI for hue shift, need to switch branch.
FrancescoC-unity Oct 4, 2021
5b6fb71
Naive hue shift version
FrancescoC-unity Oct 6, 2021
92f1ef3
Option to have full ACES -- Note HDR always uses full.
FrancescoC-unity Oct 6, 2021
6f91b69
Add better tooltip
FrancescoC-unity Oct 6, 2021
3238bc1
Hue shift + add some desat on no hue shift regardless.
FrancescoC-unity Oct 7, 2021
3f9e187
Dont compute LUT unless we need to.
FrancescoC-unity Oct 7, 2021
3ac0123
Selectable fallback
FrancescoC-unity Oct 7, 2021
a0503a7
Fix scene view
FrancescoC-unity Oct 8, 2021
a3a7d7f
Add paperwhite back into ACES mode
FrancescoC-unity Oct 8, 2021
6423b45
Minor cleanup
FrancescoC-unity Oct 8, 2021
98bd50f
Add HDR bit depth to the LUT hash.
FrancescoC-unity Oct 8, 2021
3551ebd
Changelog
FrancescoC-unity Oct 8, 2021
7557a4c
Merge branch 'master' into HDRP/hdr-device-support
FrancescoC-unity Oct 8, 2021
baf4f01
Fix NONE tonemapper case fallbacking into ACES
FrancescoC-unity Oct 8, 2021
4e1afd0
wokaround compile issue?
FrancescoC-unity Oct 8, 2021
f77cf3d
For simplicity move old tests to sRGB grading
FrancescoC-unity Oct 8, 2021
b545a67
Fix desaturation so it uses BT2390 doc (but similar to prev ad-hoc ve…
FrancescoC-unity Oct 11, 2021
475e700
Missing code change.
FrancescoC-unity Oct 11, 2021
1aae7ca
Documentation sync point (missing debug views)
FrancescoC-unity Oct 11, 2021
9af3604
Added debug view docs
FrancescoC-unity Oct 11, 2021
f5626c0
Add link to tonemap
FrancescoC-unity Oct 11, 2021
af1355e
Fix player Rec2020
FrancescoC-unity Oct 12, 2021
8ca33de
Revert "Add link to tonemap"
FrancescoC-unity Oct 12, 2021
2f72330
Revert "Added debug view docs"
FrancescoC-unity Oct 12, 2021
939a212
Revert "Documentation sync point (missing debug views)"
FrancescoC-unity Oct 12, 2021
7c84247
Warning fix and fix lut not updating upon changing color space
FrancescoC-unity Oct 13, 2021
6ff1cfa
Reduce code duplication in ACES
FrancescoC-unity Oct 14, 2021
6d34281
Other review corrections
FrancescoC-unity Oct 14, 2021
fb78e6a
Small issues left with previous commits
FrancescoC-unity Oct 14, 2021
9658adc
Fix tooltips
FrancescoC-unity Oct 25, 2021
afd9bcb
Hide HDR label with no tonemap
FrancescoC-unity Oct 27, 2021
eb96d1a
Disable in Metal
FrancescoC-unity Oct 27, 2021
186a3d7
Merge branch 'master' into HDRP/hdr-device-support
FrancescoC-unity Oct 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MonoBehaviour:
m_RenderingPathDefaultCameraFrameSettings:
bitDatas:
data1: 136268574097245
data2: 4539628428617252888
data2: 4539628437207187480
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
Expand Down Expand Up @@ -62,9 +62,11 @@ MonoBehaviour:
materialQuality: 0
m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7,
type: 2}
m_RenderPipelineRayTracingResources: {fileID: 0}
m_RenderPipelineRayTracingResources: {fileID: 11400000, guid: ba6e7f30e5cffc249a8bf7ee5756c196,
type: 2}
beforeTransparentCustomPostProcesses: []
beforePostProcessCustomPostProcesses: []
afterPostProcessBlursCustomPostProcesses: []
afterPostProcessCustomPostProcesses: []
beforeTAACustomPostProcesses: []
lightLayerName0:
Expand All @@ -85,6 +87,7 @@ MonoBehaviour:
decalLayerName7:
shaderVariantLogLevel: 0
lensAttenuationMode: 0
colorGradingSpace: 1
diffusionProfileSettingsList:
- {fileID: 11400000, guid: dd7a918c1bae69f44837b38174e50a61, type: 2}
- {fileID: 11400000, guid: d48d38dbecb5bf44db08516376edc733, type: 2}
Expand All @@ -98,4 +101,15 @@ MonoBehaviour:
- {fileID: 11400000, guid: 458d5c32111ea5749a494da813d01275, type: 2}
- {fileID: 11400000, guid: 404820c4cf36ad944862fa59c56064f0, type: 2}
- {fileID: 11400000, guid: 2384dbf2c1c420f45a792fbc315fbfb1, type: 2}
m_Version: 1
rendererListCulling: 0
DLSSProjectId: 000000
useDLSSCustomProjectId: 0
supportProbeVolumes: 0
supportRuntimeDebugDisplay: 1
apvScenesData:
serializedBounds: []
serializedHasVolumes: []
serializedProfiles: []
serializedBakeSettings: []
serializedBakingSets: []
m_Version: 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 781cc897cf8675041a751163b51f97dd, type: 3}
m_Name: HDRenderPipelineGlobalSettings
m_EditorClassIdentifier:
m_DefaultVolumeProfile: {fileID: 11400000, guid: 582adbd84082fdb4faf7cd4beb1ccd14,
type: 2}
m_LookDevVolumeProfile: {fileID: 0}
m_RenderingPathDefaultCameraFrameSettings:
bitDatas:
data1: 140649441525597
data2: 4539628434053070872
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
maximumLODLevel: 0
maximumLODLevelMode: 0
maximumLODLevelQualityLevel: 0
sssQualityMode: 0
sssQualityLevel: 0
sssCustomSampleBudget: 20
msaaMode: 1
materialQuality: 0
m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings:
bitDatas:
data1: 135310787769117
data2: 4539628424389459992
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
maximumLODLevel: 0
maximumLODLevelMode: 0
maximumLODLevelQualityLevel: 0
sssQualityMode: 0
sssQualityLevel: 0
sssCustomSampleBudget: 20
msaaMode: 1
materialQuality: 0
m_RenderingPathDefaultRealtimeReflectionFrameSettings:
bitDatas:
data1: 140060864290589
data2: 4539628424389459992
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
maximumLODLevel: 0
maximumLODLevelMode: 0
maximumLODLevelQualityLevel: 0
sssQualityMode: 0
sssQualityLevel: 0
sssCustomSampleBudget: 20
msaaMode: 1
materialQuality: 0
m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7,
type: 2}
m_RenderPipelineRayTracingResources: {fileID: 0}
beforeTransparentCustomPostProcesses: []
beforePostProcessCustomPostProcesses: []
afterPostProcessBlursCustomPostProcesses: []
afterPostProcessCustomPostProcesses: []
beforeTAACustomPostProcesses: []
lightLayerName0: Light Layer default
lightLayerName1: Light Layer 1
lightLayerName2: Light Layer 2
lightLayerName3: Light Layer 3
lightLayerName4: Light Layer 4
lightLayerName5: Light Layer 5
lightLayerName6: Light Layer 6
lightLayerName7: Light Layer 7
decalLayerName0: Decal Layer default
decalLayerName1: Decal Layer 1
decalLayerName2: Decal Layer 2
decalLayerName3: Decal Layer 3
decalLayerName4: Decal Layer 4
decalLayerName5: Decal Layer 5
decalLayerName6: Decal Layer 6
decalLayerName7: Decal Layer 7
shaderVariantLogLevel: 0
lensAttenuationMode: 0
colorGradingSpace: 1
diffusionProfileSettingsList: []
rendererListCulling: 0
DLSSProjectId: 000000
useDLSSCustomProjectId: 0
supportProbeVolumes: 0
supportRuntimeDebugDisplay: 0
apvScenesData:
serializedBounds: []
serializedHasVolumes: []
serializedProfiles: []
serializedBakeSettings: []
serializedBakingSets: []
m_Version: 3
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ MonoBehaviour:
decalLayerName7:
shaderVariantLogLevel: 0
lensAttenuationMode: 0
colorGradingSpace: 1
diffusionProfileSettingsList:
- {fileID: 11400000, guid: 2384dbf2c1c420f45a792fbc315fbfb1, type: 2}
- {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ MonoBehaviour:
decalLayerName7: Decal Layer 7
shaderVariantLogLevel: 0
lensAttenuationMode: 0
colorGradingSpace: 1
diffusionProfileSettingsList:
- {fileID: 11400000, guid: 802c802428a2d9640a87e821dfcdd9e8, type: 2}
- {fileID: 11400000, guid: 09c63d8f96a14884e8efd2f01004f491, type: 2}
Expand All @@ -114,7 +115,10 @@ MonoBehaviour:
useDLSSCustomProjectId: 0
supportProbeVolumes: 0
supportRuntimeDebugDisplay: 0
apvScenesBounds:
apvScenesData:
serializedBounds: []
serializedHasVolumes: []
serializedProfiles: []
serializedBakeSettings: []
serializedBakingSets: []
m_Version: 3
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ MonoBehaviour:
decalLayerName7: Decal Layer 7
shaderVariantLogLevel: 0
lensAttenuationMode: 0
colorGradingSpace: 1
diffusionProfileSettingsList:
- {fileID: 11400000, guid: cbe1ee9036c47b84ba1b8b3dbcde2aff, type: 2}
- {fileID: 11400000, guid: 38c0905fbe269274782e939ce4393d85, type: 2}
Expand All @@ -99,4 +100,5 @@ MonoBehaviour:
serializedHasVolumes: []
serializedProfiles: []
serializedBakeSettings: []
serializedBakingSets: []
m_Version: 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using UnityEngine.Serialization;

namespace UnityEngine.Rendering
{
[GenerateHLSL]
/// <summary>
/// The available options for range reduction/tonemapping when outputting to an HDR device.
/// </summary>
public enum HDRRangeReduction
{
/// <summary>
/// No range reduction.
/// </summary>
None,
/// <summary>
/// Reinhard tonemapping.
/// </summary>
Reinhard,
/// <summary>
/// BT2390 Hermite spline EETF range reduction.
/// </summary>
BT2390,
/// <summary>
/// ACES tonemapping preset for 1000 nits displays.
/// </summary>
ACES1000Nits,
/// <summary>
/// ACES tonemapping preset for 2000 nits displays.
/// </summary>
ACES2000Nits,
/// <summary>
/// ACES tonemapping preset for 4000 nits displays.
/// </summary>
ACES4000Nits
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit > Rendering > Generate Shader Includes ] instead
//

#ifndef HDROUTPUTDEFINES_CS_HLSL
#define HDROUTPUTDEFINES_CS_HLSL
//
// UnityEngine.Rendering.HDRRangeReduction: static fields
//
#define HDRRANGEREDUCTION_NONE (0)
#define HDRRANGEREDUCTION_REINHARD (1)
#define HDRRANGEREDUCTION_BT2390 (2)
#define HDRRANGEREDUCTION_ACES1000NITS (3)
#define HDRRANGEREDUCTION_ACES2000NITS (4)
#define HDRRANGEREDUCTION_ACES4000NITS (5)


#endif

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading