Skip to content

Commit 2e21289

Browse files
[VFX] Fix new SG integration & Sample Texture/Buffer (to 21.2) (#5605)
* [VFX] Fix new SG integration & Sample Texture/Buffer (#5416) * Fix missing texture & buffer declaration While using new SG integration, the required textures weren't declared. TODO : Fix 35_ShaderGeneration, we are facing multiple definition WIP : I'm not sure about the side effect of this change & we need to register a fogbugz * *No change : add note * Fix initial solution from d0246e1 If a input is declared in SG, we have to skip it here. * Add graphicTest coverage (TODO : Update image references) * Update reference image for D3D TODO : Update OSX Image reference * Equivalent integration but move the responsability of filtering to subtarget * *Missing image reference update from D3D12 * Revert note in VFXShaderGraphParticleOutput.cs * Update changelog & Missing image reference * Missing WriteBuffer to support mesh sampling * Minor : Update Comment * Fix missing graphicsBuffer declaration Resolve issue #5416 (review) # Conflicts: # com.unity.visualeffectgraph/CHANGELOG.md * Move changelog entry from added to fixed
1 parent d9ab55b commit 2e21289

File tree

15 files changed

+4177
-15
lines changed

15 files changed

+4177
-15
lines changed

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/35_ShaderGraphGenerationFTP.unity

Lines changed: 220 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,10 +851,12 @@ MonoBehaviour:
851851
taaAntiFlicker: 0.5
852852
taaMotionVectorRejection: 0
853853
taaAntiHistoryRinging: 0
854+
taaBaseBlendFactor: 0.875
854855
physicalParameters:
855856
m_Iso: 200
856857
m_ShutterSpeed: 0.005
857858
m_Aperture: 16
859+
m_FocusDistance: 10
858860
m_BladeCount: 5
859861
m_Curvature: {x: 2, y: 11}
860862
m_BarrelClipping: 0.25
@@ -869,7 +871,14 @@ MonoBehaviour:
869871
serializedVersion: 2
870872
m_Bits: 4294967295
871873
hasPersistentHistory: 0
874+
allowDeepLearningSuperSampling: 1
875+
deepLearningSuperSamplingUseCustomQualitySettings: 0
876+
deepLearningSuperSamplingQuality: 0
877+
deepLearningSuperSamplingUseCustomAttributes: 0
878+
deepLearningSuperSamplingUseOptimalSettings: 1
879+
deepLearningSuperSamplingSharpening: 0
872880
exposureTarget: {fileID: 0}
881+
materialMipBias: 0
873882
m_RenderingPathCustomFrameSettings:
874883
bitDatas:
875884
data1: 72198262773251917
@@ -1003,6 +1012,103 @@ Transform:
10031012
m_Father: {fileID: 0}
10041013
m_RootOrder: 0
10051014
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1015+
--- !u!1 &341903774
1016+
GameObject:
1017+
m_ObjectHideFlags: 0
1018+
m_CorrespondingSourceObject: {fileID: 0}
1019+
m_PrefabInstance: {fileID: 0}
1020+
m_PrefabAsset: {fileID: 0}
1021+
serializedVersion: 6
1022+
m_Component:
1023+
- component: {fileID: 341903775}
1024+
- component: {fileID: 341903777}
1025+
- component: {fileID: 341903776}
1026+
m_Layer: 0
1027+
m_Name: 'Text: Read Texture'
1028+
m_TagString: Untagged
1029+
m_Icon: {fileID: 0}
1030+
m_NavMeshLayer: 0
1031+
m_StaticEditorFlags: 0
1032+
m_IsActive: 1
1033+
--- !u!4 &341903775
1034+
Transform:
1035+
m_ObjectHideFlags: 0
1036+
m_CorrespondingSourceObject: {fileID: 0}
1037+
m_PrefabInstance: {fileID: 0}
1038+
m_PrefabAsset: {fileID: 0}
1039+
m_GameObject: {fileID: 341903774}
1040+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1041+
m_LocalPosition: {x: -0.010999978, y: 0.21300006, z: 0.01}
1042+
m_LocalScale: {x: 0.82, y: 0.82, z: 0.82}
1043+
m_ConstrainProportionsScale: 0
1044+
m_Children: []
1045+
m_Father: {fileID: 2045132519}
1046+
m_RootOrder: 19
1047+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1048+
--- !u!102 &341903776
1049+
TextMesh:
1050+
serializedVersion: 3
1051+
m_ObjectHideFlags: 0
1052+
m_CorrespondingSourceObject: {fileID: 0}
1053+
m_PrefabInstance: {fileID: 0}
1054+
m_PrefabAsset: {fileID: 0}
1055+
m_GameObject: {fileID: 341903774}
1056+
m_Text: Read Texture
1057+
m_OffsetZ: 0
1058+
m_CharacterSize: 0.03
1059+
m_LineSpacing: 1
1060+
m_Anchor: 4
1061+
m_Alignment: 1
1062+
m_TabSize: 4
1063+
m_FontSize: 30
1064+
m_FontStyle: 0
1065+
m_RichText: 1
1066+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
1067+
m_Color:
1068+
serializedVersion: 2
1069+
rgba: 4294967295
1070+
--- !u!23 &341903777
1071+
MeshRenderer:
1072+
m_ObjectHideFlags: 0
1073+
m_CorrespondingSourceObject: {fileID: 0}
1074+
m_PrefabInstance: {fileID: 0}
1075+
m_PrefabAsset: {fileID: 0}
1076+
m_GameObject: {fileID: 341903774}
1077+
m_Enabled: 1
1078+
m_CastShadows: 1
1079+
m_ReceiveShadows: 1
1080+
m_DynamicOccludee: 1
1081+
m_StaticShadowCaster: 0
1082+
m_MotionVectors: 1
1083+
m_LightProbeUsage: 1
1084+
m_ReflectionProbeUsage: 1
1085+
m_RayTracingMode: 2
1086+
m_RayTraceProcedural: 0
1087+
m_RenderingLayerMask: 1
1088+
m_RendererPriority: 0
1089+
m_Materials:
1090+
- {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
1091+
m_StaticBatchInfo:
1092+
firstSubMesh: 0
1093+
subMeshCount: 0
1094+
m_StaticBatchRoot: {fileID: 0}
1095+
m_ProbeAnchor: {fileID: 0}
1096+
m_LightProbeVolumeOverride: {fileID: 0}
1097+
m_ScaleInLightmap: 1
1098+
m_ReceiveGI: 1
1099+
m_PreserveUVs: 0
1100+
m_IgnoreNormalsForChartDetection: 0
1101+
m_ImportantGI: 0
1102+
m_StitchLightmapSeams: 1
1103+
m_SelectedEditorRenderState: 3
1104+
m_MinimumChartSize: 4
1105+
m_AutoUVMaxDistance: 0.5
1106+
m_AutoUVMaxAngle: 89
1107+
m_LightmapParameters: {fileID: 0}
1108+
m_SortingLayerID: 0
1109+
m_SortingLayer: 0
1110+
m_SortingOrder: 0
1111+
m_AdditionalVertexStreams: {fileID: 0}
10061112
--- !u!1 &360942860
10071113
GameObject:
10081114
m_ObjectHideFlags: 0
@@ -1349,6 +1455,7 @@ Transform:
13491455
- {fileID: 360942863}
13501456
- {fileID: 618300804}
13511457
- {fileID: 1469261017}
1458+
- {fileID: 781032550}
13521459
m_Father: {fileID: 0}
13531460
m_RootOrder: 4
13541461
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1873,6 +1980,116 @@ Transform:
18731980
m_Father: {fileID: 2045132519}
18741981
m_RootOrder: 14
18751982
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1983+
--- !u!1 &781032549
1984+
GameObject:
1985+
m_ObjectHideFlags: 0
1986+
m_CorrespondingSourceObject: {fileID: 0}
1987+
m_PrefabInstance: {fileID: 0}
1988+
m_PrefabAsset: {fileID: 0}
1989+
serializedVersion: 6
1990+
m_Component:
1991+
- component: {fileID: 781032550}
1992+
- component: {fileID: 781032552}
1993+
- component: {fileID: 781032551}
1994+
m_Layer: 0
1995+
m_Name: VFX - SG_ReadTexture
1996+
m_TagString: Untagged
1997+
m_Icon: {fileID: 0}
1998+
m_NavMeshLayer: 0
1999+
m_StaticEditorFlags: 0
2000+
m_IsActive: 1
2001+
--- !u!4 &781032550
2002+
Transform:
2003+
m_ObjectHideFlags: 0
2004+
m_CorrespondingSourceObject: {fileID: 0}
2005+
m_PrefabInstance: {fileID: 0}
2006+
m_PrefabAsset: {fileID: 0}
2007+
m_GameObject: {fileID: 781032549}
2008+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2009+
m_LocalPosition: {x: -0.09720135, y: 0.9572819, z: -0.91092634}
2010+
m_LocalScale: {x: 0.61426914, y: 0.61426914, z: 0.61426914}
2011+
m_ConstrainProportionsScale: 0
2012+
m_Children: []
2013+
m_Father: {fileID: 481649549}
2014+
m_RootOrder: 14
2015+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2016+
--- !u!73398921 &781032551
2017+
VFXRenderer:
2018+
serializedVersion: 1
2019+
m_ObjectHideFlags: 2
2020+
m_CorrespondingSourceObject: {fileID: 0}
2021+
m_PrefabInstance: {fileID: 0}
2022+
m_PrefabAsset: {fileID: 0}
2023+
m_GameObject: {fileID: 781032549}
2024+
m_Enabled: 1
2025+
m_CastShadows: 0
2026+
m_ReceiveShadows: 0
2027+
m_DynamicOccludee: 1
2028+
m_StaticShadowCaster: 0
2029+
m_MotionVectors: 0
2030+
m_LightProbeUsage: 0
2031+
m_ReflectionProbeUsage: 0
2032+
m_RayTracingMode: 0
2033+
m_RayTraceProcedural: 0
2034+
m_RenderingLayerMask: 257
2035+
m_RendererPriority: 0
2036+
m_StaticBatchInfo:
2037+
firstSubMesh: 0
2038+
subMeshCount: 0
2039+
m_StaticBatchRoot: {fileID: 0}
2040+
m_ProbeAnchor: {fileID: 0}
2041+
m_LightProbeVolumeOverride: {fileID: 0}
2042+
m_ScaleInLightmap: 1
2043+
m_ReceiveGI: 1
2044+
m_PreserveUVs: 0
2045+
m_IgnoreNormalsForChartDetection: 0
2046+
m_ImportantGI: 0
2047+
m_StitchLightmapSeams: 1
2048+
m_SelectedEditorRenderState: 3
2049+
m_MinimumChartSize: 4
2050+
m_AutoUVMaxDistance: 0.5
2051+
m_AutoUVMaxAngle: 89
2052+
m_LightmapParameters: {fileID: 0}
2053+
m_SortingLayerID: 0
2054+
m_SortingLayer: 0
2055+
m_SortingOrder: 0
2056+
--- !u!2083052967 &781032552
2057+
VisualEffect:
2058+
m_ObjectHideFlags: 0
2059+
m_CorrespondingSourceObject: {fileID: 0}
2060+
m_PrefabInstance: {fileID: 0}
2061+
m_PrefabAsset: {fileID: 0}
2062+
m_GameObject: {fileID: 781032549}
2063+
m_Enabled: 1
2064+
m_Asset: {fileID: 8926484042661614526, guid: d4a8b97617744d244b42f183f8299a66, type: 3}
2065+
m_InitialEventName: OnPlay
2066+
m_InitialEventNameOverriden: 0
2067+
m_StartSeed: 0
2068+
m_ResetSeedOnPlay: 0
2069+
m_ResourceVersion: 1
2070+
m_PropertySheet:
2071+
m_Float:
2072+
m_Array: []
2073+
m_Vector2f:
2074+
m_Array: []
2075+
m_Vector3f:
2076+
m_Array: []
2077+
m_Vector4f:
2078+
m_Array: []
2079+
m_Uint:
2080+
m_Array: []
2081+
m_Int:
2082+
m_Array: []
2083+
m_Matrix4x4f:
2084+
m_Array: []
2085+
m_AnimationCurve:
2086+
m_Array: []
2087+
m_Gradient:
2088+
m_Array: []
2089+
m_NamedObject:
2090+
m_Array: []
2091+
m_Bool:
2092+
m_Array: []
18762093
--- !u!1 &895925019
18772094
GameObject:
18782095
m_ObjectHideFlags: 0
@@ -2736,7 +2953,7 @@ MonoBehaviour:
27362953
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
27372954
m_Name:
27382955
m_EditorClassIdentifier:
2739-
isGlobal: 1
2956+
m_IsGlobal: 1
27402957
priority: 0
27412958
blendDistance: 0
27422959
weight: 1
@@ -4442,6 +4659,7 @@ MonoBehaviour:
44424659
ActiveImageTests: 1
44434660
ActivePixelTests: 7
44444661
captureFrameRate: 20
4662+
fixedTimeStepScale: 1
44454663
simulateTime: 5.95
44464664
xrCompatible: 1
44474665
--- !u!4 &2038637876
@@ -4506,6 +4724,7 @@ Transform:
45064724
- {fileID: 934684567}
45074725
- {fileID: 1741961817}
45084726
- {fileID: 159541057}
4727+
- {fileID: 341903775}
45094728
m_Father: {fileID: 0}
45104729
m_RootOrder: 3
45114730
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)