Unity 6 Render Graph API Compilation Fixes (#224)

Author: Cameron-Micka

com.microsoft.mrtk.graphicstools.shadergraph.unity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.microsoft.mrtk.graphicstools.shadergraph.unity",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "displayName": "MRTK Graphics Tools Shader Graph",
   "description": "Graphics tools and components for developing Mixed Reality applications in Unity Shader Graph.",
   "documentationUrl": "https://aka.ms/mrtk3graphics",

com.microsoft.mrtk.graphicstools.unity/Editor/Utilities/ScreenshotUtilities.cs

@@ -86,7 +86,7 @@ public static bool CaptureScreenshot(string path, int superSize = 1, bool transp
 
                 if (camera == null)
                 {
-#if UNITY_2023_1_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
                     camera = GameObject.FindFirstObjectByType<Camera>();
 #else
                     camera = GameObject.FindObjectOfType<Camera>();

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Acrylic/Scripts/AcrylicBlurRenderPass.cs

@@ -56,6 +56,9 @@ public AcrylicBlurRenderPass(string _profilerLabel, int _downSamplePasses, int _
 
         private Vector4 info = Vector4.zero;
 
+#if UNITY_6000_0_OR_NEWER
+        [System.Obsolete]
+#endif
         public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
         {
             int width = cameraTextureDescriptor.width / downSample;
@@ -110,6 +113,9 @@ private static RenderTargetIdentifier GetIdentifier(RenderTargetHandle target)
 
 #endif
 
+#if UNITY_6000_0_OR_NEWER
+        [System.Obsolete]
+#endif
         public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
         {
             CommandBuffer cmd = CommandBufferPool.Get(profilerLabel);

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Acrylic/Scripts/AcrylicLayer.cs

@@ -4,7 +4,9 @@
 #if GT_USE_URP
 using System;
 using UnityEngine;
+#if !UNITY_6000_0_OR_NEWER
 using UnityEngine.Experimental.Rendering.Universal;
+#endif
 using UnityEngine.Profiling;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Magnifier/Scripts/MagnifierManager.cs

@@ -4,7 +4,9 @@
 #if GT_USE_URP
 using System.Collections.Generic;
 using UnityEngine;
+#if !UNITY_6000_0_OR_NEWER
 using UnityEngine.Experimental.Rendering.Universal;
+#endif
 using UnityEngine.Rendering.Universal;
 
 namespace Microsoft.MixedReality.GraphicsTools

com.microsoft.mrtk.graphicstools.unity/Runtime/Utilities/ClearRenderTargetPass.cs

@@ -23,6 +23,9 @@ public ClearRenderTargetPass(ClearRenderTarget.PassSettings passSettings)
         /// <summary>
         /// Queues a ClearRenderTarget command based on the pass settings.
         /// </summary>
+#if UNITY_6000_0_OR_NEWER
+        [System.Obsolete]
+#endif
         public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
         {
             CommandBuffer cmd = CommandBufferPool.Get();

com.microsoft.mrtk.graphicstools.unity/Runtime/Utilities/DrawFullscreenPass.cs

@@ -35,6 +35,9 @@ public DrawFullscreenPass(string tag)
         }
 
         /// <inheritdoc/>
+#if UNITY_6000_0_OR_NEWER
+        [System.Obsolete]
+#endif
         public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData)
         {
             RenderTextureDescriptor blitTargetDescriptor = renderingData.cameraData.cameraTargetDescriptor;
@@ -70,6 +73,9 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin
         }
 
         /// <inheritdoc/>
+#if UNITY_6000_0_OR_NEWER
+        [System.Obsolete]
+#endif
         public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
         {
             CommandBuffer cmd = CommandBufferPool.Get(profilerTag);

com.microsoft.mrtk.graphicstools.unity/Runtime/Utilities/FlyCameraController.cs

@@ -95,7 +95,7 @@ private void OnEnable()
         /// </summary>
         private void Start()
         {
-#if UNITY_2023_1_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
             SubsystemManager.GetSubsystems(xrDisplaySubsystems);
 #else
             SubsystemManager.GetInstances(xrDisplaySubsystems);

com.microsoft.mrtk.graphicstools.unity/Samples~/MaterialGallery/Scripts/MaterialMatrix.cs

@@ -52,7 +52,11 @@ private void Update()
             // Poll for when the render pipeline changes.
             if (useDefaultMaterial)
             {
+#if UNITY_6000_0_OR_NEWER
+                if (lastRenderPipelineAsset != GraphicsSettings.defaultRenderPipeline)
+#else
                 if (lastRenderPipelineAsset != GraphicsSettings.renderPipelineAsset)
+#endif
                 {
                     BuildMatrix();
                 }
@@ -83,8 +87,11 @@ private void BuildMatrix()
 
             if (useDefaultMaterial)
             {
+#if UNITY_6000_0_OR_NEWER
+                lastRenderPipelineAsset = GraphicsSettings.defaultRenderPipeline;
+#else
                 lastRenderPipelineAsset = GraphicsSettings.renderPipelineAsset;
-
+#endif
                 if (lastRenderPipelineAsset != null)
                 {
                     currentMaterial = lastRenderPipelineAsset.defaultMaterial;

com.microsoft.mrtk.graphicstools.unity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.microsoft.mrtk.graphicstools.unity",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "displayName": "MRTK Graphics Tools",
   "description": "Graphics tools and components for developing Mixed Reality applications in Unity.",
   "documentationUrl": "https://aka.ms/mrtk3graphics",