Skip to content

Commit 09b9609

Browse files
Wilfrid-UnityEvergreen
authored andcommitted
[Port] [6000.4] [UUM-130732][Switch2] Fix/workaround for GPU crash when running URP VFX unit tests
1 parent 4935310 commit 09b9609

3 files changed

Lines changed: 68 additions & 3 deletions

File tree

Packages/com.unity.visualeffectgraph/Editor/Models/Operators/Implementations/SampleMesh.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ private static VFXExpression SampleVertexAttribute(VFXExpression source, VFXExpr
445445
var outputType = GetSampledType(vertexAttribute);
446446
VFXExpression sampled = null;
447447

448+
vertexIndex = new VFXExpressionMin(vertexIndex, new VFXExpressionMeshVertexCount(mesh));
448449
var meshChannelFormatAndDimension = new VFXExpressionMeshChannelInfos(mesh, channelIndex);
449450
var vertexOffset = vertexIndex * meshVertexStride + meshChannelOffset;
450451

Tests/SRPTests/Projects/VisualEffectGraph_URP/ProjectSettings/ProjectSettings.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ PlayerSettings:
120120
xboxOneEnableTypeOptimization: 0
121121
xboxOnePresentImmediateThreshold: 0
122122
switchQueueCommandMemory: 1048576
123-
switchQueueControlMemory: 65536
123+
switchQueueControlMemory: 1048576
124124
switchQueueComputeMemory: 262144
125125
switchNVNShaderPoolsGranularity: 33554432
126126
switchNVNDefaultPoolsGranularity: 16777216
127127
switchNVNOtherPoolsGranularity: 16777216
128128
switchGpuScratchPoolGranularity: 2097152
129129
switchAllowGpuScratchShrinking: 0
130-
switchNVNMaxPublicTextureIDCount: 0
131-
switchNVNMaxPublicSamplerIDCount: 0
130+
switchNVNMaxPublicTextureIDCount: 65536
131+
switchNVNMaxPublicSamplerIDCount: 65536
132132
switchMaxWorkerMultiple: 8
133133
switchNVNGraphicsFirmwareMemory: 32
134134
vulkanNumSwapchainBuffers: 3
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 21014, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier: UnityEditor.Switch2.Extensions.dll::UnityEditor.Switch2.Switch2PlayerSettings
15+
m_SocketConfigEnabled: 0
16+
m_SocketMemoryPoolSize: 6144
17+
m_SocketAllocatorPoolSize: 128
18+
m_SocketConcurrencyLimit: 14
19+
m_TcpInitialSendBufferSize: 32
20+
m_TcpInitialReceiveBufferSize: 64
21+
m_TcpAutoSendBufferSizeMax: 256
22+
m_TcpAutoReceiveBufferSizeMax: 256
23+
m_UdpSendBufferSize: 9
24+
m_UdpReceiveBufferSize: 42
25+
m_SocketBufferEfficiency: 4
26+
m_SocketInitializeEnabled: 1
27+
m_NetworkInterfaceManagerInitializeEnabled: 1
28+
m_HTCSForPlayerConnectionDisabled: 0
29+
m_LTOSetting: 0
30+
m_UseCPUProfiler: 0
31+
m_EnableFileSystemTrace: 0
32+
m_PrimaryQueueCommandMemory: 4194304
33+
m_PrimaryQueueControlMemory: 65536
34+
m_PrimaryQueueComputeMemory: 262144
35+
m_ComputeQueueCommandMemory: 4194304
36+
m_ComputeQueueControlMemory: 16384
37+
m_ComputeQueueComputeMemory: 262144
38+
m_NVNShaderPoolsGranularity: 33554432
39+
m_NVNDefaultPoolsGranularity: 16777216
40+
m_NVNOtherPoolsGranularity: 16777216
41+
m_GpuScratchPoolGranularity: 2097152
42+
m_AllowGpuScratchShrinking: 0
43+
m_NVNMaxPublicTextureIDCount: 65536
44+
m_NVNMaxPublicSamplerIDCount: 65536
45+
m_KMaxWorkerMultiple: 8
46+
m_DisableAsyncCompute: 0
47+
m_EnableNxLegacyTextureLayout: 0
48+
m_ExperimentalNvnDeviceInitializeDlssFlag: 0
49+
m_CompilerFlags:
50+
-
51+
m_NMETAOverride:
52+
m_ScreenResolutionBehavior: 2
53+
m_NativeFsCacheSize: 32
54+
m_IsHoldTypeHorizontal: 1
55+
m_SupportedNpadCount: 8
56+
m_EnableTouchScreen: 1
57+
m_NSODependencies:
58+
m_MicroSleepForYieldTime: 25
59+
m_EnableRamDiskSupport: 0
60+
m_RamDiskSpaceSize: 12
61+
m_DockedResolution: 1
62+
m_HandheldResolution: 1
63+
m_SupportedNpadStyles: 22
64+
m_ExtendedStructuredBufferBindings: 0

0 commit comments

Comments
 (0)