Skip to content

Commit 0f6037d

Browse files
PaulDemeulenaereGitHub Enterprise
authored andcommitted
Fix several URP issue (for 10.2) (#116)
* *Prepare Scene for new sample reflection test * *Update Scene * Fix Reflection Probe missing edition URP only because SupportedRenderingFeatures.active.reflectionProbes is tested * Filter out rendererPriority if SupportedRenderingFeatures.active.rendererPriority returns false * Fix missing layer option : correctly fallback to the default layer if srpAsset.renderingLayerMaskNames returns null * Prepare test addition for RenderDepth * Fix missing depthpass in URP * *Add test data * *Add Test Data for SubPixelAA * Fix SubPixelAA * Fix missing warning using Proxy Volume with URP * Add two sections in inspector to separate probe setting than additionnal Also add a comment about m_SortingOrder * *Update 014 before moving this to common * Add 014_ScreenSpaceSize to HDRP * *Add graphicTest for URP * *Add Reference images for player * *Add missing meta file * *Add Editor Image reference * *Update changelog.md * Add editor test : Check_VFXRenderer_DefaultRenderingLayerNames * Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/116#discussion_r78363
1 parent 02f6be6 commit 0f6037d

File tree

67 files changed

+22867
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+22867
-34
lines changed

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXComponentTest.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,17 @@ public IEnumerator CreateComponent_And_Graph_Restart_Component_Expected()
202202
yield return new ExitPlayMode();
203203
}
204204

205+
[UnityTest]
206+
public IEnumerator Check_VFXRenderer_DefaultRenderingLayerNames()
207+
{
208+
//The content of default rendering layer names is retrieved by reflection.
209+
var layerNames = VisualEffectEditor.RendererEditor.s_DefaultRenderingLayerNames;
210+
Assert.IsNotNull(layerNames);
211+
Assert.IsTrue(layerNames.Length != 0);
212+
Assert.IsFalse(layerNames.Any(o => string.IsNullOrEmpty(o)));
213+
yield return null;
214+
}
215+
205216
[UnityTest]
206217
public IEnumerator CreateComponent_And_Graph_Modify_It_To_Generate_Expected_Exception()
207218
{
Loading
Loading

TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ EditorBuildSettings:
4747
- enabled: 1
4848
path: Packages/com.unity.testing.visualeffectgraph/Scenes/013_MeshStripping.unity
4949
guid: b87edfbe03e2426478130a56dc42a592
50+
- enabled: 1
51+
path: Packages/com.unity.testing.visualeffectgraph/Scenes/014_ScreenSpaceSize.unity
52+
guid: 61def4e00f202154a972b59fa6fb735e
5053
- enabled: 1
5154
path: Assets/AllTests/VFXTests/GraphicsTests/101_Exposure.unity
5255
guid: 4125f3630764c6a43a752a73908fa0ee
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: 101_Blue
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 2000
17+
stringTagMap:
18+
RenderType: Opaque
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _BaseMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _BumpMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _DetailAlbedoMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailMask:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailNormalMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _EmissionMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MainTex:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MetallicGlossMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _OcclusionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _ParallaxMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _SpecGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
m_Floats:
68+
- _AlphaClip: 0
69+
- _Blend: 0
70+
- _BumpScale: 1
71+
- _ClearCoatMask: 0
72+
- _ClearCoatSmoothness: 0
73+
- _Cull: 2
74+
- _Cutoff: 0.5
75+
- _DetailAlbedoMapScale: 1
76+
- _DetailNormalMapScale: 1
77+
- _DstBlend: 0
78+
- _EnvironmentReflections: 1
79+
- _GlossMapScale: 0
80+
- _Glossiness: 0
81+
- _GlossyReflections: 0
82+
- _Metallic: 0
83+
- _OcclusionStrength: 1
84+
- _Parallax: 0.005
85+
- _QueueOffset: 0
86+
- _ReceiveShadows: 1
87+
- _Smoothness: 0.5
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 1
91+
- _Surface: 0
92+
- _WorkflowMode: 1
93+
- _ZWrite: 1
94+
m_Colors:
95+
- _BaseColor: {r: 0.06666667, g: 0.6392157, b: 0.85098046, a: 1}
96+
- _Color: {r: 1, g: 1, b: 1, a: 1}
97+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
98+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
99+
m_BuildTextureStacks: []
100+
--- !u!114 &7706024250472979239
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 3

TestProjects/VisualEffectGraph_URP/Assets/GraphicsTests/101_Blue.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: 101_Metallic
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 2000
17+
stringTagMap:
18+
RenderType: Opaque
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _BaseMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _BumpMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _DetailAlbedoMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailMask:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailNormalMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _EmissionMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MainTex:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MetallicGlossMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _OcclusionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _ParallaxMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _SpecGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
m_Floats:
68+
- _AlphaClip: 0
69+
- _Blend: 0
70+
- _BumpScale: 1
71+
- _ClearCoatMask: 0
72+
- _ClearCoatSmoothness: 0
73+
- _Cull: 2
74+
- _Cutoff: 0.5
75+
- _DetailAlbedoMapScale: 1
76+
- _DetailNormalMapScale: 1
77+
- _DstBlend: 0
78+
- _EnvironmentReflections: 1
79+
- _GlossMapScale: 0
80+
- _Glossiness: 0
81+
- _GlossyReflections: 0
82+
- _Metallic: 1
83+
- _OcclusionStrength: 1
84+
- _Parallax: 0.005
85+
- _QueueOffset: 0
86+
- _ReceiveShadows: 1
87+
- _Smoothness: 1
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 1
91+
- _Surface: 0
92+
- _WorkflowMode: 1
93+
- _ZWrite: 1
94+
m_Colors:
95+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
96+
- _Color: {r: 1, g: 1, b: 1, a: 1}
97+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
98+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
99+
m_BuildTextureStacks: []
100+
--- !u!114 &6316880553823624142
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 3

TestProjects/VisualEffectGraph_URP/Assets/GraphicsTests/101_Metallic.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: 101_Red
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 2000
17+
stringTagMap:
18+
RenderType: Opaque
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _BaseMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _BumpMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _DetailAlbedoMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailMask:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailNormalMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _EmissionMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MainTex:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MetallicGlossMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _OcclusionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _ParallaxMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _SpecGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
m_Floats:
68+
- _AlphaClip: 0
69+
- _Blend: 0
70+
- _BumpScale: 1
71+
- _ClearCoatMask: 0
72+
- _ClearCoatSmoothness: 0
73+
- _Cull: 2
74+
- _Cutoff: 0.5
75+
- _DetailAlbedoMapScale: 1
76+
- _DetailNormalMapScale: 1
77+
- _DstBlend: 0
78+
- _EnvironmentReflections: 1
79+
- _GlossMapScale: 0
80+
- _Glossiness: 0
81+
- _GlossyReflections: 0
82+
- _Metallic: 0
83+
- _OcclusionStrength: 1
84+
- _Parallax: 0.005
85+
- _QueueOffset: 0
86+
- _ReceiveShadows: 1
87+
- _Smoothness: 0.5
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 1
91+
- _Surface: 0
92+
- _WorkflowMode: 1
93+
- _ZWrite: 1
94+
m_Colors:
95+
- _BaseColor: {r: 0.8431373, g: 0.08235294, b: 0.53333336, a: 1}
96+
- _Color: {r: 1, g: 1, b: 1, a: 1}
97+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
98+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
99+
m_BuildTextureStacks: []
100+
--- !u!114 &7706024250472979239
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 3

0 commit comments

Comments
 (0)