Merge pull request #182 from CyberAgentGameEntertainment/bugfix/unity_6004_error

Fix Unity 6 compile errors: remove testframework.graphics and guard removed CompatibilityMode API

Author: sakumanaoki

Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs

@@ -18,7 +18,9 @@ public partial class ApplyDistortionPass : ScriptableRenderPass
         private readonly Material _material;
         private readonly ProfilingSampler _renderPassProfilingSampler;
 
+#if !UNITY_6000_4_OR_NEWER
         private RenderTargetIdentifier _distortedUvBufferIdentifier;
+#endif
 
         public ApplyDistortionPass(bool applyToSceneView, Shader shader)
         {
@@ -28,11 +30,14 @@ public ApplyDistortionPass(bool applyToSceneView, Shader shader)
             renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing;
         }
 
+#if !UNITY_6000_4_OR_NEWER
         public void Setup(RenderTargetIdentifier distortedUvBufferIdentifier)
         {
             _distortedUvBufferIdentifier = distortedUvBufferIdentifier;
         }
+#endif
 
+#if !UNITY_6000_4_OR_NEWER
 #if UNITY_2023_3_OR_NEWER
         [Obsolete(DeprecationMessage.CompatibilityScriptingAPIObsolete, false)]
 #endif
@@ -56,5 +61,6 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
             context.ExecuteCommandBuffer(cmd);
             CommandBufferPool.Release(cmd);
         }
+#endif
     }
 }

Assets/Nova/Runtime/Core/Scripts/DistortedUvBufferPass.cs

@@ -21,7 +21,9 @@ public partial class DistortedUvBufferPass : ScriptableRenderPass
         private readonly ShaderTagId _shaderTagId;
         private FilteringSettings _filteringSettings;
 
+#if !UNITY_6000_4_OR_NEWER
         private RTHandle _renderTargetRTHandle;
+#endif
 
 #if UNITY_2023_3_OR_NEWER
         private readonly GraphicsFormat _colorFormat;
@@ -40,11 +42,14 @@ public DistortedUvBufferPass(string lightMode)
 #endif
         }
 
+#if !UNITY_6000_4_OR_NEWER
         public void Setup(RTHandle renderTargetRTHandle)
         {
             _renderTargetRTHandle = renderTargetRTHandle;
         }
+#endif
 
+#if !UNITY_6000_4_OR_NEWER
 #if UNITY_2023_3_OR_NEWER
         [Obsolete(DeprecationMessage.CompatibilityScriptingAPIObsolete, false)]
 #endif
@@ -83,5 +88,6 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
             context.ExecuteCommandBuffer(cmd);
             CommandBufferPool.Release(cmd);
         }
+#endif
     }
 }

Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs

@@ -51,7 +51,7 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
                 || renderingData.cameraData.cameraType == CameraType.Preview
                 || !IsPostProcessingAllowed(ref renderingData))
                 return;
-
+#if !UNITY_6000_4_OR_NEWER
 #if UNITY_2023_3_OR_NEWER
             if (GraphicsSettings.GetRenderPipelineSettings<RenderGraphSettings>().enableRenderCompatibilityMode)
 #endif
@@ -65,6 +65,7 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
                 _distortedUvBufferPass.Setup(_distortedUvBufferRTHandle);
                 _applyDistortionPass.Setup(_distortedUvBufferRTHandle);
             }
+#endif
 
             renderer.EnqueuePass(_distortedUvBufferPass);
             renderer.EnqueuePass(_applyDistortionPass);

Assets/Nova/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jp.co.cyberagent.nova",
   "displayName": "NOVA Shader",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "unity": "2022.3",
   "license": "MIT",
   "dependencies": {