Skip to content

Commit 0070610

Browse files
Tanya-Li-UnityEvergreen
Tanya-Li-Unity
authored and
Evergreen
committed
[content automatically redacted] touching PlatformDependent folder
1 parent 3207b22 commit 0070610

File tree

25 files changed

+22
-63
lines changed

25 files changed

+22
-63
lines changed

‎Packages/com.unity.render-pipelines.core/Runtime/Unity.RenderPipelines.Core.Runtime.asmdef‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"autoReferenced": true,
1616
"defineConstraints": [],
1717
"versionDefines": [
18-
{
19-
"name": "com.unity.modules.vr",
20-
"expression": "1.0.0",
21-
"define": "ENABLE_VR_MODULE"
22-
},
2318
{
2419
"name": "com.unity.modules.xr",
2520
"expression": "1.0.0",

‎Packages/com.unity.render-pipelines.core/Runtime/XR/XRSRPSettings.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using UnityEditor;
33
using UnityEngine.Experimental.Rendering;
44

5-
#if ENABLE_VR && ENABLE_VR_MODULE
5+
#if ENABLE_VR && ENABLE_XR_MODULE
66
using UnityEngine.XR;
77
#endif
88

@@ -35,7 +35,7 @@ public static bool enabled
3535
{
3636
get
3737
{
38-
#if ENABLE_VR && ENABLE_VR_MODULE
38+
#if ENABLE_VR && ENABLE_XR_MODULE
3939
return XRSettings.enabled;
4040
#else
4141
return false;
@@ -50,7 +50,7 @@ public static bool isDeviceActive
5050
{
5151
get
5252
{
53-
#if ENABLE_VR && ENABLE_VR_MODULE
53+
#if ENABLE_VR && ENABLE_XR_MODULE
5454
if (enabled)
5555
return XRSettings.isDeviceActive;
5656
#endif
@@ -65,7 +65,7 @@ public static string loadedDeviceName
6565
{
6666
get
6767
{
68-
#if ENABLE_VR && ENABLE_VR_MODULE
68+
#if ENABLE_VR && ENABLE_XR_MODULE
6969
if (enabled)
7070
return XRSettings.loadedDeviceName;
7171
#endif
@@ -80,7 +80,7 @@ public static string[] supportedDevices
8080
{
8181
get
8282
{
83-
#if ENABLE_VR && ENABLE_VR_MODULE
83+
#if ENABLE_VR && ENABLE_XR_MODULE
8484
if (enabled)
8585
return XRSettings.supportedDevices;
8686
#endif
@@ -95,7 +95,7 @@ public static RenderTextureDescriptor eyeTextureDesc
9595
{
9696
get
9797
{
98-
#if ENABLE_VR && ENABLE_VR_MODULE
98+
#if ENABLE_VR && ENABLE_XR_MODULE
9999
if (enabled)
100100
return XRSettings.eyeTextureDesc;
101101
#endif
@@ -110,7 +110,7 @@ public static int eyeTextureWidth
110110
{
111111
get
112112
{
113-
#if ENABLE_VR && ENABLE_VR_MODULE
113+
#if ENABLE_VR && ENABLE_XR_MODULE
114114
if (enabled)
115115
return XRSettings.eyeTextureWidth;
116116
#endif
@@ -125,7 +125,7 @@ public static int eyeTextureHeight
125125
{
126126
get
127127
{
128-
#if ENABLE_VR && ENABLE_VR_MODULE
128+
#if ENABLE_VR && ENABLE_XR_MODULE
129129
if (enabled)
130130
return XRSettings.eyeTextureHeight;
131131
#endif
@@ -140,15 +140,15 @@ public static float occlusionMeshScale
140140
{
141141
get
142142
{
143-
#if ENABLE_VR && ENABLE_VR_MODULE
143+
#if ENABLE_VR && ENABLE_XR_MODULE
144144
if (enabled)
145145
return XRSystem.GetOcclusionMeshScale();
146146
#endif
147147
return 0;
148148
}
149149
set
150150
{
151-
#if ENABLE_VR && ENABLE_VR_MODULE
151+
#if ENABLE_VR && ENABLE_XR_MODULE
152152
if (enabled)
153153
XRSystem.SetOcclusionMeshScale(value);
154154
#endif
@@ -162,15 +162,15 @@ public static bool useVisibilityMesh
162162
{
163163
get
164164
{
165-
#if ENABLE_VR && ENABLE_VR_MODULE
165+
#if ENABLE_VR && ENABLE_XR_MODULE
166166
if (enabled)
167167
return XRSystem.GetUseVisibilityMesh();
168168
#endif
169169
return false;
170170
}
171171
set
172172
{
173-
#if ENABLE_VR && ENABLE_VR_MODULE
173+
#if ENABLE_VR && ENABLE_XR_MODULE
174174
if (enabled)
175175
XRSystem.SetUseVisibilityMesh(value);
176176
#endif
@@ -184,15 +184,15 @@ public static int mirrorViewMode
184184
{
185185
get
186186
{
187-
#if ENABLE_VR && ENABLE_VR_MODULE
187+
#if ENABLE_VR && ENABLE_XR_MODULE
188188
if (enabled)
189189
return XRSystem.GetMirrorViewMode();
190190
#endif
191191
return 0;
192192
}
193193
set
194194
{
195-
#if ENABLE_VR && ENABLE_VR_MODULE
195+
#if ENABLE_VR && ENABLE_XR_MODULE
196196
if (enabled)
197197
XRSystem.SetMirrorViewMode(value);
198198
#endif

‎Packages/com.unity.render-pipelines.core/Tests/Runtime/Unity.RenderPipelines.Core.Runtime.Tests.asmdef‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
"UNITY_INCLUDE_TESTS"
2020
],
2121
"versionDefines": [
22-
{
23-
"name": "com.unity.modules.vr",
24-
"expression": "1.0.0",
25-
"define": "ENABLE_VR_MODULE"
26-
},
2722
{
2823
"name": "com.unity.modules.xr",
2924
"expression": "1.0.0",

‎Packages/com.unity.render-pipelines.high-definition/Runtime/Unity.RenderPipelines.HighDefinition.Runtime.asmdef‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
"expression": "0.0.0",
2828
"define": "HDRP_1_OR_NEWER"
2929
},
30-
{
31-
"name": "com.unity.modules.vr",
32-
"expression": "1.0.0",
33-
"define": "ENABLE_VR_MODULE"
34-
},
3530
{
3631
"name": "com.unity.modules.xr",
3732
"expression": "1.0.0",

‎Packages/com.unity.render-pipelines.universal/Runtime/2D/Unity.RenderPipelines.Universal.2D.Runtime.asmdef‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
"expression": "13.0.1",
4646
"define": "USING_2DANIMATION_13_0_1_OR_ABOVE"
4747
},
48-
{
49-
"name": "com.unity.modules.vr",
50-
"expression": "1.0.0",
51-
"define": "ENABLE_VR_MODULE"
52-
},
5348
{
5449
"name": "com.unity.modules.xr",
5550
"expression": "1.0.0",

‎Packages/com.unity.render-pipelines.universal/Runtime/ShadowUtils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ internal static float SoftShadowQualityToShaderProperty(Light light, bool softSh
662662
internal static bool SupportsPerLightSoftShadowQuality()
663663
{
664664
bool supportsPerLightSoftShadowQuality = true;
665-
#if ENABLE_VR && ENABLE_VR_MODULE
665+
#if ENABLE_VR && ENABLE_XR_MODULE
666666
#if PLATFORM_WINRT || PLATFORM_ANDROID
667667
// We are using static branches on Quest2 + HL for performance reasons
668668
supportsPerLightSoftShadowQuality = !PlatformAutoDetect.isXRMobile;

‎Packages/com.unity.render-pipelines.universal/Runtime/Unity.RenderPipelines.Universal.Runtime.asmdef‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
"expression": "1.0.0",
3939
"define": "ENABLE_BURST_1_0_0_OR_NEWER"
4040
},
41-
{
42-
"name": "com.unity.modules.vr",
43-
"expression": "1.0.0",
44-
"define": "ENABLE_VR_MODULE"
45-
},
4641
{
4742
"name": "com.unity.modules.xr",
4843
"expression": "1.0.0",

‎Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ internal static class PlatformAutoDetect
19551955
internal static void Initialize()
19561956
{
19571957
bool isRunningMobile = false;
1958-
#if ENABLE_VR && ENABLE_VR_MODULE
1958+
#if ENABLE_VR && ENABLE_XR_MODULE
19591959
#if PLATFORM_WINRT || PLATFORM_ANDROID
19601960
isRunningMobile = IsRunningXRMobile();
19611961
#endif
@@ -1967,7 +1967,7 @@ internal static void Initialize()
19671967
isSwitch2 = Application.platform == RuntimePlatform.Switch2;
19681968
}
19691969

1970-
#if ENABLE_VR && ENABLE_VR_MODULE
1970+
#if ENABLE_VR && ENABLE_XR_MODULE
19711971
#if PLATFORM_WINRT || PLATFORM_ANDROID
19721972
// XR mobile platforms are not treated as dedicated mobile platforms in Core. Handle them specially here. (Quest and HL).
19731973
private static List<XR.XRDisplaySubsystem> displaySubsystemList = new List<XR.XRDisplaySubsystem>();

‎Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ internal RenderingMode renderingModeActual {
192192
Material m_CameraMotionVecMaterial = null;
193193

194194
internal bool isPostProcessActive { get => m_PostProcess != null; }
195-
195+
196196
internal DeferredLights deferredLights { get => m_DeferredLights; }
197197
internal LayerMask prepassLayerMask { get; set; }
198198
internal LayerMask opaqueLayerMask { get; set; }
@@ -267,7 +267,7 @@ public UniversalRenderer(UniversalRendererData data) : base(data)
267267

268268
this.stripShadowsOffVariants = data.stripShadowsOffVariants;
269269
this.stripAdditionalLightOffVariants = data.stripAdditionalLightOffVariants;
270-
#if ENABLE_VR && ENABLE_VR_MODULE
270+
#if ENABLE_VR && ENABLE_XR_MODULE
271271
#if PLATFORM_WINRT || PLATFORM_ANDROID
272272
// AdditionalLightOff variant is available on HL&Quest platform due to performance consideration.
273273
this.stripAdditionalLightOffVariants = !PlatformAutoDetect.isXRMobile;
@@ -362,7 +362,7 @@ public UniversalRenderer(UniversalRendererData data) : base(data)
362362

363363
m_DrawOffscreenUIPass = new DrawScreenSpaceUIPass(RenderPassEvent.BeforeRenderingPostProcessing, true);
364364
m_DrawOverlayUIPass = new DrawScreenSpaceUIPass(RenderPassEvent.AfterRendering + k_AfterFinalBlitPassQueueOffset, false); // after m_FinalBlitPass
365-
365+
366366
//No postProcessData means that post processes are disabled
367367
if (data.postProcessData != null)
368368
{
@@ -444,7 +444,7 @@ internal override void ReleaseRenderTargets()
444444
{
445445
if (m_DeferredLights != null && !m_DeferredLights.UseFramebufferFetch)
446446
m_GBufferPass?.Dispose();
447-
447+
448448
m_MainLightShadowCasterPass?.Dispose();
449449
m_AdditionalLightsShadowCasterPass?.Dispose();
450450
}
@@ -684,7 +684,7 @@ void AddRequirementsOfInternalFeatures(ref RenderPassInputSummary inputSummary,
684684
if (renderingLayerProvidesByDepthNormalPass)
685685
inputSummary.requiresNormalsTexture = true;
686686
}
687-
687+
688688
internal static bool PlatformRequiresExplicitMsaaResolve()
689689
{
690690
#if UNITY_EDITOR

‎Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Packages/manifest.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"com.unity.modules.unitywebrequestwww": "1.0.0",
4545
"com.unity.modules.vehicles": "1.0.0",
4646
"com.unity.modules.video": "1.0.0",
47-
"com.unity.modules.vr": "1.0.0",
4847
"com.unity.modules.wind": "1.0.0",
4948
"com.unity.modules.xr": "1.0.0"
5049
},

0 commit comments

Comments
 (0)