Skip to content

Commit 6718006

Browse files
sebastienlagardesebastienlagarde
committed
HDRenderLoop: Update shader generation code for debug with last change
1 parent 79e0259 commit 6718006

8 files changed

Lines changed: 119 additions & 99 deletions

File tree

‎Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ MonoBehaviour:
99
m_Enabled: 1
1010
m_EditorHideFlags: 0
1111
m_Script: {fileID: 11500000, guid: 558064ecdbf6b6742892d699acb39aed, type: 3}
12-
m_Name:
12+
m_Name: HDRenderLoop
1313
m_EditorClassIdentifier:

‎Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/BuiltinData.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,29 @@ namespace Builtin
1616
[GenerateHLSL(PackingRules.Exact, true, 100)]
1717
public struct BuiltinData
1818
{
19+
[SurfaceDataAttributes("Opacity")]
1920
public float opacity;
2021

2122
// These are lighting data.
2223
// We would prefer to split lighting and material information but for performance reasons,
2324
// those lighting information are fill
2425
// at the same time than material information.
26+
[SurfaceDataAttributes("Bake Diffuse Lighting")]
2527
public Vector3 bakeDiffuseLighting; // This is the result of sampling lightmap/lightprobe/proxyvolume
2628

29+
[SurfaceDataAttributes("Emissive Color")]
2730
public Vector3 emissiveColor;
31+
[SurfaceDataAttributes("Emissive Intensity")]
2832
public float emissiveIntensity;
2933

3034
// These is required for motion blur and temporalAA
35+
[SurfaceDataAttributes("Velocity")]
3136
public Vector2 velocity;
3237

3338
// Distortion
39+
[SurfaceDataAttributes("Distortion")]
3440
public Vector2 distortion;
41+
[SurfaceDataAttributes("Distortion Blur")]
3542
public float distortionBlur; // Define the color buffer mipmap level to use
3643
};
3744
}

‎Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/BuiltinData.cs.hlsl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
// UnityEngine.ScriptableRenderLoop.Builtin.BuiltinData: static fields
77
//
88
#define DEBUGVIEW_BUILTIN_BUILTINDATA_OPACITY (100)
9-
#define DEBUGVIEW_BUILTIN_BUILTINDATA_BAKEDIFFUSELIGHTING (101)
10-
#define DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVECOLOR (102)
11-
#define DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVEINTENSITY (103)
9+
#define DEBUGVIEW_BUILTIN_BUILTINDATA_BAKE_DIFFUSE_LIGHTING (101)
10+
#define DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVE_COLOR (102)
11+
#define DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVE_INTENSITY (103)
1212
#define DEBUGVIEW_BUILTIN_BUILTINDATA_VELOCITY (104)
1313
#define DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTION (105)
14-
#define DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTIONBLUR (106)
14+
#define DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTION_BLUR (106)
1515

1616
// Generated from UnityEngine.ScriptableRenderLoop.Builtin.BuiltinData
1717
// PackingRules = Exact

‎Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/BuiltinData.hlsl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ void GetBuiltinDataDebug(uint paramId, BuiltinData builtinData, inout float3 res
1717
case DEBUGVIEW_BUILTIN_BUILTINDATA_OPACITY:
1818
result = builtinData.opacity.xxx;
1919
break;
20-
case DEBUGVIEW_BUILTIN_BUILTINDATA_BAKEDIFFUSELIGHTING:
20+
case DEBUGVIEW_BUILTIN_BUILTINDATA_BAKE_DIFFUSE_LIGHTING:
2121
// TODO: require a remap
2222
result = builtinData.bakeDiffuseLighting;
2323
break;
24-
case DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVECOLOR:
24+
case DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVE_COLOR:
2525
result = builtinData.emissiveColor; needLinearToSRGB = true;
2626
break;
27-
case DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVEINTENSITY:
27+
case DEBUGVIEW_BUILTIN_BUILTINDATA_EMISSIVE_INTENSITY:
2828
result = builtinData.emissiveIntensity.xxx;
2929
break;
3030
case DEBUGVIEW_BUILTIN_BUILTINDATA_VELOCITY:
@@ -33,7 +33,7 @@ void GetBuiltinDataDebug(uint paramId, BuiltinData builtinData, inout float3 res
3333
case DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTION:
3434
result = float3(builtinData.distortion, 0.0);
3535
break;
36-
case DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTIONBLUR:
36+
case DEBUGVIEW_BUILTIN_BUILTINDATA_DISTORTION_BLUR:
3737
result = builtinData.distortionBlur.xxx;
3838
break;
3939
}

‎Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ namespace UnityEngine.ScriptableRenderLoop
77
{
88
namespace Lit
99
{
10+
[GenerateHLSL(PackingRules.Exact)]
11+
public enum MaterialId
12+
{
13+
LitStandard = 0,
14+
LitSSS = 1,
15+
LitClearCoat = 2,
16+
LitSpecular = 3
17+
};
18+
1019
//-----------------------------------------------------------------------------
1120
// SurfaceData
1221
//-----------------------------------------------------------------------------
@@ -15,14 +24,6 @@ namespace Lit
1524
[GenerateHLSL(PackingRules.Exact, true, 1000)]
1625
public struct SurfaceData
1726
{
18-
public enum MaterialId
19-
{
20-
LIT_STANDARD = 0,
21-
LIT_SSS = 1,
22-
LIT_CLEARCOAT = 2,
23-
LIT_SPECULAR = 3
24-
};
25-
2627
[SurfaceDataAttributes("Base Color")]
2728
public Vector3 baseColor;
2829
[SurfaceDataAttributes("Specular Occlusion")]
@@ -110,4 +111,4 @@ public struct BSDFData
110111
// fold into fresnel0
111112
};
112113
}
113-
}
114+
}

‎Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit.cs.hlsl‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,53 @@
22
// This file was automatically generated from Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit.cs. Please don't edit by hand.
33
//
44

5+
//
6+
// UnityEngine.ScriptableRenderLoop.Lit.MaterialId: static fields
7+
//
8+
#define MATERIALID_LIT_STANDARD (0)
9+
#define MATERIALID_LIT_SSS (1)
10+
#define MATERIALID_LIT_CLEAR_COAT (2)
11+
#define MATERIALID_LIT_SPECULAR (3)
12+
513
//
614
// UnityEngine.ScriptableRenderLoop.Lit.SurfaceData: static fields
715
//
8-
#define DEBUGVIEW_LIT_SURFACEDATA_BASECOLOR (1000)
9-
#define DEBUGVIEW_LIT_SURFACEDATA_SPECULAROCCLUSION (1001)
10-
#define DEBUGVIEW_LIT_SURFACEDATA_NORMALWS (1002)
11-
#define DEBUGVIEW_LIT_SURFACEDATA_PERCEPTUALSMOOTHNESS (1003)
12-
#define DEBUGVIEW_LIT_SURFACEDATA_MATERIALID (1004)
13-
#define DEBUGVIEW_LIT_SURFACEDATA_AMBIENTOCCLUSION (1005)
14-
#define DEBUGVIEW_LIT_SURFACEDATA_TANGENTWS (1006)
16+
#define DEBUGVIEW_LIT_SURFACEDATA_BASE_COLOR (1000)
17+
#define DEBUGVIEW_LIT_SURFACEDATA_SPECULAR_OCCLUSION (1001)
18+
#define DEBUGVIEW_LIT_SURFACEDATA_NORMAL_WS (1002)
19+
#define DEBUGVIEW_LIT_SURFACEDATA_PERCEPTUAL_SMOOTHNESS (1003)
20+
#define DEBUGVIEW_LIT_SURFACEDATA_MATERIAL_ID (1004)
21+
#define DEBUGVIEW_LIT_SURFACEDATA_AMBIENT_OCCLUSION (1005)
22+
#define DEBUGVIEW_LIT_SURFACEDATA_TANGENT_WS (1006)
1523
#define DEBUGVIEW_LIT_SURFACEDATA_ANISOTROPY (1007)
1624
#define DEBUGVIEW_LIT_SURFACEDATA_METALIC (1008)
1725
#define DEBUGVIEW_LIT_SURFACEDATA_SPECULAR (1009)
18-
#define DEBUGVIEW_LIT_SURFACEDATA_SUBSURFACERADIUS (1010)
26+
#define DEBUGVIEW_LIT_SURFACEDATA_SUB_SURFACE_RADIUS (1010)
1927
#define DEBUGVIEW_LIT_SURFACEDATA_THICKNESS (1011)
20-
#define DEBUGVIEW_LIT_SURFACEDATA_SUBSURFACEPROFILE (1012)
21-
#define DEBUGVIEW_LIT_SURFACEDATA_COATNORMALWS (1013)
22-
#define DEBUGVIEW_LIT_SURFACEDATA_COATPERCEPTUALSMOOTHNESS (1014)
23-
#define DEBUGVIEW_LIT_SURFACEDATA_SPECULARCOLOR (1015)
28+
#define DEBUGVIEW_LIT_SURFACEDATA_SUB_SURFACE_PROFILE (1012)
29+
#define DEBUGVIEW_LIT_SURFACEDATA_COAT_NORMAL_WS (1013)
30+
#define DEBUGVIEW_LIT_SURFACEDATA_COAT_PERCEPTUAL_SMOOTHNESS (1014)
31+
#define DEBUGVIEW_LIT_SURFACEDATA_SPECULAR_COLOR (1015)
2432

2533
//
2634
// UnityEngine.ScriptableRenderLoop.Lit.BSDFData: static fields
2735
//
28-
#define DEBUGVIEW_LIT_BSDFDATA_DIFFUSECOLOR (1030)
36+
#define DEBUGVIEW_LIT_BSDFDATA_DIFFUSE_COLOR (1030)
2937
#define DEBUGVIEW_LIT_BSDFDATA_FRESNEL0 (1031)
30-
#define DEBUGVIEW_LIT_BSDFDATA_SPECULAROCCLUSION (1032)
31-
#define DEBUGVIEW_LIT_BSDFDATA_NORMALWS (1033)
32-
#define DEBUGVIEW_LIT_BSDFDATA_PERCEPTUALROUGHNESS (1034)
38+
#define DEBUGVIEW_LIT_BSDFDATA_SPECULAR_OCCLUSION (1032)
39+
#define DEBUGVIEW_LIT_BSDFDATA_NORMAL_WS (1033)
40+
#define DEBUGVIEW_LIT_BSDFDATA_PERCEPTUAL_ROUGHNESS (1034)
3341
#define DEBUGVIEW_LIT_BSDFDATA_ROUGHNESS (1035)
34-
#define DEBUGVIEW_LIT_BSDFDATA_MATERIALID (1036)
35-
#define DEBUGVIEW_LIT_BSDFDATA_TANGENTWS (1037)
36-
#define DEBUGVIEW_LIT_BSDFDATA_BITANGENTWS (1038)
37-
#define DEBUGVIEW_LIT_BSDFDATA_ROUGHNESST (1039)
38-
#define DEBUGVIEW_LIT_BSDFDATA_ROUGHNESSB (1040)
39-
#define DEBUGVIEW_LIT_BSDFDATA_SUBSURFACERADIUS (1041)
42+
#define DEBUGVIEW_LIT_BSDFDATA_MATERIAL_ID (1036)
43+
#define DEBUGVIEW_LIT_BSDFDATA_TANGENT_WS (1037)
44+
#define DEBUGVIEW_LIT_BSDFDATA_BITANGENT_WS (1038)
45+
#define DEBUGVIEW_LIT_BSDFDATA_ROUGHNESS_T (1039)
46+
#define DEBUGVIEW_LIT_BSDFDATA_ROUGHNESS_B (1040)
47+
#define DEBUGVIEW_LIT_BSDFDATA_SUB_SURFACE_RADIUS (1041)
4048
#define DEBUGVIEW_LIT_BSDFDATA_THICKNESS (1042)
41-
#define DEBUGVIEW_LIT_BSDFDATA_SUBSURFACEPROFILE (1043)
42-
#define DEBUGVIEW_LIT_BSDFDATA_COATNORMALWS (1044)
43-
#define DEBUGVIEW_LIT_BSDFDATA_COATROUGHNESS (1045)
49+
#define DEBUGVIEW_LIT_BSDFDATA_SUB_SURFACE_PROFILE (1043)
50+
#define DEBUGVIEW_LIT_BSDFDATA_COAT_NORMAL_WS (1044)
51+
#define DEBUGVIEW_LIT_BSDFDATA_COAT_ROUGHNESS (1045)
4452

4553
// Generated from UnityEngine.ScriptableRenderLoop.Lit.SurfaceData
4654
// PackingRules = Exact

0 commit comments

Comments
 (0)