Missing updates for HoloLens version

EarthDigitalTwin · Oct 2, 2023 · 4d80ff4 · 4d80ff4
1 parent ef77242
commit 4d80ff4
Show file tree

Hide file tree

Showing 9 changed files with 6,573 additions and 7,260 deletions.
diff --git a/...iders/WindowsMixedReality/XRSDK/Microsoft.MixedReality.Toolkit.Providers.XRSDK.WMR.asmdef b/...iders/WindowsMixedReality/XRSDK/Microsoft.MixedReality.Toolkit.Providers.XRSDK.WMR.asmdef
@@ -3,9 +3,9 @@
     "references": [
         "Microsoft.MixedReality.Toolkit",
         "Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality.Shared",
-        "Microsoft.MixedReality.Toolkit.Providers.XRSDK"
+        "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
+        "Unity.XR.WindowsMixedReality"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor",
         "WSA"
@@ -17,5 +17,13 @@
     "autoReferenced": true,
     "defineConstraints": [
         "UNITY_2019_3_OR_NEWER"
-    ]
+    ],
+    "versionDefines": [
+        {
+            "name": "com.unity.xr.windowsmr",
+            "expression": "",
+            "define": "WMR_ENABLED"
+        }
+    ],
+    "noEngineReferences": false
 }
diff --git a/...MixedRealityToolkit.Providers/XRSDK/Microsoft.MixedReality.Toolkit.Providers.XRSDK.asmdef b/...MixedRealityToolkit.Providers/XRSDK/Microsoft.MixedReality.Toolkit.Providers.XRSDK.asmdef
@@ -1,9 +1,11 @@
 {
     "name": "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
     "references": [
-        "Microsoft.MixedReality.Toolkit"
+        "Microsoft.MixedReality.Toolkit",
+        "Unity.XR.Management",
+        "Unity.XR.ARSubsystems",
+        "UnityEngine.SpatialTracking"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
@@ -12,5 +14,23 @@
     "autoReferenced": true,
     "defineConstraints": [
         "UNITY_2019_3_OR_NEWER"
-    ]
+    ],
+    "versionDefines": [
+        {
+            "name": "com.unity.xr.management",
+            "expression": "",
+            "define": "XR_MANAGEMENT_ENABLED"
+        },
+        {
+            "name": "com.unity.xr.arsubsystems",
+            "expression": "",
+            "define": "ARSUBSYSTEMS_ENABLED"
+        },
+        {
+            "name": "com.unity.xr.legacyinputhelpers",
+            "expression": "",
+            "define": "SPATIALTRACKING_ENABLED"
+        }
+    ],
+    "noEngineReferences": false
 }
diff --git a/Assets/Plugins/PostProcessing/Runtime/Utils/TextureFormatUtilities.cs b/Assets/Plugins/PostProcessing/Runtime/Utils/TextureFormatUtilities.cs
@@ -51,18 +51,18 @@ static TextureFormatUtilities()
                 { TextureFormat.ETC2_RGB, RenderTextureFormat.ARGB32 },
                 { TextureFormat.ETC2_RGBA1, RenderTextureFormat.ARGB32 },
                 { TextureFormat.ETC2_RGBA8, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_4x4, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_5x5, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_6x6, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_8x8, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_10x10, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGB_12x12, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_4x4, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_5x5, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_6x6, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_8x8, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_10x10, RenderTextureFormat.ARGB32 },
-                { TextureFormat.ASTC_RGBA_12x12, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_4x4, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_5x5, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_6x6, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_8x8, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_10x10, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_12x12, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_4x4, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_5x5, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_6x6, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_8x8, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_10x10, RenderTextureFormat.ARGB32 },
+                { TextureFormat.ASTC_12x12, RenderTextureFormat.ARGB32 },
                 { TextureFormat.ETC_RGB4_3DS, RenderTextureFormat.ARGB32 },
                 { TextureFormat.ETC_RGBA8_3DS, RenderTextureFormat.ARGB32 }
             };