Internal/6000.3/staging

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs

@@ -37,6 +37,10 @@ internal class RenderGraphTestPipelineAsset : RenderPipelineAsset<RenderGraphTes
 
             public RenderGraph renderGraph;
 
+            public RenderTextureUVOriginStrategy renderTextureUVOriginStrategy;
+
+            public bool invalidContextForTesting;
+
             protected override RenderPipeline CreatePipeline()
             {
                 return new RenderGraphTestPipelineInstance(this);
@@ -76,7 +80,8 @@ protected override void Render(ScriptableRenderContext renderContext, List<Camer
                         commandBuffer = cmd,
                         scriptableRenderContext = renderContext,
                         currentFrameIndex = Time.frameCount,
-                        invalidContextForTesting = false
+                        invalidContextForTesting = asset.invalidContextForTesting,
+                        renderTextureUVOriginStrategy = asset.renderTextureUVOriginStrategy
                     };
 
                     try
@@ -99,10 +104,14 @@ protected override void Render(ScriptableRenderContext renderContext, List<Camer
                         return;
                     }
 
-                    renderContext.ExecuteCommandBuffer(cmd);
+                    if (rgParams.invalidContextForTesting == false)
+                    {
+                        renderContext.ExecuteCommandBuffer(cmd);
+                    }
 
                     CommandBufferPool.Release(cmd);
                 }
+
                 renderContext.Submit();
             }
         }
@@ -175,6 +184,7 @@ public void Cleanup()
         [TearDown]
         public void CleanupRenderGraph()
         {
+            m_RenderGraphTestPipeline.invalidContextForTesting = false;
             // Cleaning all Render Graph resources and data structures
             // Nothing remains, Render Graph in next test will start from scratch
             m_RenderGraph.ForceCleanup();

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs

@@ -901,6 +901,11 @@ void OnAutoPlayStatusChanged(ChangeEvent<bool> evt)
             autoPlayToggle.text = evt.newValue ? L10n.Tr("Auto Update") : L10n.Tr("Pause");
             m_Paused = evt.newValue;
 
+            if (!m_Paused && !m_IsDeviceConnected && m_ConnectedDeviceName != k_EditorName)
+            {
+                ConnectDebugSession<RenderGraphEditorLocalDebugSession>();
+            }
+
             UpdateStatusLabel();
 
             // Force update when unpausing
@@ -2100,7 +2105,7 @@ void CreateGUI()
                 else
                 {
                     m_ConnectedDeviceName = k_EditorName;
-                    m_IsDeviceConnected = false;
+                    m_IsDeviceConnected = true;
                 }
 
                 connectionState.Dispose(); // Dispose it immediately after use
@@ -2157,15 +2162,22 @@ void OnPlayerDisconnected(int playerID)
                 }
             }
 
-            ConnectDebugSession<RenderGraphEditorLocalDebugSession>();
+            if (!m_Paused)
+            {
+                ConnectDebugSession<RenderGraphEditorLocalDebugSession>();
+            }
+            else
+            {
+                UpdateStatusLabel();
+            }
         }
 
         internal void ConnectDebugSession<TSession>()
             where TSession : RenderGraphDebugSession, new()
         {
             if (typeof(TSession) == typeof(RenderGraphEditorLocalDebugSession))
             {
-                if (!m_IsDeviceConnected)
+                if (m_ConnectedDeviceName == "Unknown" || m_ConnectedDeviceName == k_EditorName)
                 {
                     m_ConnectedDeviceName = k_EditorName;
                     m_IsDeviceConnected = true;

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs

@@ -19,7 +19,7 @@ static void CreateVolumeProfile()
                 0,
                 ScriptableObject.CreateInstance<CreateVolumeProfileAction>(),
                 "New Volume Profile.asset",
-                null,
+                CoreUtils.GetIconForType<VolumeProfile>(),
                 null
             );
         }
@@ -40,7 +40,7 @@ public static void CreateVolumeProfileWithCallback(string fullPath, Action<Volum
                 assetCreator.GetInstanceID(),
                 assetCreator,
                 fullPath,
-                null,
+                CoreUtils.GetIconForType<VolumeProfile>(),
                 null);
         }
 

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Components/DisallowGPUDrivenRendering.cs

@@ -62,7 +62,8 @@ private static void AllowGPUDrivenRenderingRecursively(Transform transform, bool
         private void OnValidate()
         {
             OnDisable();
-            OnEnable();
+            if (enabled)
+                OnEnable();
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/CompilerContextData.cs

@@ -247,6 +247,19 @@ public void CullAllPasses(bool isCulled)
             }
         }
 
+        public TextureUVOrigin GetTextureUVOrigin(in TextureHandle targetHandle)
+        {
+            if (targetHandle.handle.IsValid())
+            {
+                ref readonly ResourceUnversionedData unversionedData = ref UnversionedResourceData(targetHandle.handle);
+                return unversionedData.textureUVOrigin == TextureUVOriginSelection.TopLeft ? TextureUVOrigin.TopLeft : TextureUVOrigin.BottomLeft;
+            }
+            else
+            {
+                return TextureUVOrigin.BottomLeft;
+            }
+        }
+
         // Helper to loop over native passes
         public ref struct NativePassIterator
         {

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs

@@ -16,6 +16,7 @@ internal struct RenderGraphInputInfo
             public string debugName;
             public bool disablePassCulling;
             public bool disablePassMerging;
+            public RenderTextureUVOriginStrategy renderTextureUVOriginStrategy;
         }
 
         internal RenderGraphInputInfo graph;
@@ -69,7 +70,7 @@ public void Cleanup()
         }
 
         public bool Initialize(RenderGraphResourceRegistry resources, List<RenderGraphPass> renderPasses, RenderGraphDebugParams debugParams, string debugName, bool useCompilationCaching,
-            int graphHash, int frameIndex)
+            int graphHash, int frameIndex, RenderTextureUVOriginStrategy renderTextureUVOriginStrategy)
         {
             bool cached = false;
             if (!useCompilationCaching)
@@ -82,6 +83,7 @@ public bool Initialize(RenderGraphResourceRegistry resources, List<RenderGraphPa
             graph.disablePassCulling = debugParams.disablePassCulling;
             graph.disablePassMerging = debugParams.disablePassMerging;
             graph.debugName = debugName;
+            graph.renderTextureUVOriginStrategy = renderTextureUVOriginStrategy;
 
             Clear(clearContextData: !useCompilationCaching);
 
@@ -141,6 +143,9 @@ public void Compile(RenderGraphResourceRegistry resources)
             DetectMemoryLessResources();
 
             PrepareNativeRenderPasses();
+
+            if (graph.renderTextureUVOriginStrategy == RenderTextureUVOriginStrategy.PropagateAttachmentOrientation)
+                PropagateTextureUVOrigin();
         }
 
         public void Clear(bool clearContextData)
@@ -164,6 +169,7 @@ internal enum NativeCompilerProfileId
             NRPRGComp_TryMergeNativePasses,
             NRPRGComp_FindResourceUsageRanges,
             NRPRGComp_DetectMemorylessResources,
+            NRPRGComp_PropagateTextureUVOrigin,
             NRPRGComp_ExecuteInitializeResources,
             NRPRGComp_ExecuteBeginRenderpassCommand,
             NRPRGComp_ExecuteDestroyResources,
@@ -173,7 +179,7 @@ internal enum NativeCompilerProfileId
         void ValidatePasses()
         {
             if (RenderGraph.enableValidityChecks)
-            { 
+            {
                 int tilePropertiesPassIndex = -1;
                 for (int passId = 0; passId < graph.m_RenderPasses.Count; passId++)
                 {
@@ -468,8 +474,9 @@ void CullUnusedRenderPasses()
                 }
 
                 // Update graph based on freshly culled nodes, remove any connection to them
+                // We start from the latest passes to the first ones as we might need to decrement the version number of unwritten resources
                 var numPasses = ctx.passData.Length;
-                for (int passIndex = 0; passIndex < numPasses; passIndex++)
+                for (int passIndex = numPasses - 1; passIndex >= 0; passIndex--)
                 {
                     ref readonly var pass = ref ctx.passData.ElementAt(passIndex);
 
@@ -756,6 +763,62 @@ void PrepareNativeRenderPasses()
             }
         }
 
+        void PropagateTextureUVOrigin()
+        {
+            using (new ProfilingScope(ProfilingSampler.Get(NativeCompilerProfileId.NRPRGComp_PropagateTextureUVOrigin)))
+            {
+                // Work backwards through the native pass list and propagate the texture uv origin we store with to
+                // any texture attachments that are not explicitly known (usually intermediate memoryless attachments).
+                for (int passIdx = contextData.nativePassData.Length - 1; passIdx >= 0; --passIdx)
+                {
+                    ref NativePassData nativePassData = ref contextData.nativePassData.ElementAt(passIdx);
+
+                    // Find a texture attachment that is storing to find out the orientation for this pass.
+                    int attachmentsCount = nativePassData.attachments.size;
+                    int firstStoreAttachmentIndex = 0;
+                    TextureUVOriginSelection storeUVOrigin = TextureUVOriginSelection.Unknown;
+                    for (int attIdx = 0; attIdx < attachmentsCount; ++attIdx)
+                    {
+                        ref NativePassAttachment nativePassAttachment = ref nativePassData.attachments[attIdx];
+                        if (nativePassAttachment.storeAction != RenderBufferStoreAction.DontCare)
+                        {
+                            if (nativePassAttachment.handle.type == RenderGraphResourceType.Texture) // Only textures have orientation
+                            {
+                                ref ResourceUnversionedData resData = ref contextData.UnversionedResourceData(nativePassAttachment.handle);
+                                storeUVOrigin = resData.textureUVOrigin; // Inherit the orientation of the store if we are currently storing to an unknown orientation.
+                                firstStoreAttachmentIndex = attIdx;
+                                break;
+                            }
+                        }
+                    }
+
+                    // Update any texture attachments with an unknown uv origin to the one we are going to use for storing and validate
+                    // we don't have a mixture of uv origins on the texture attachment list as this would mean something is going to be
+                    // read/written upside down.
+                    for (int attIdx = 0; attIdx < attachmentsCount; ++attIdx)
+                    {
+                        ref NativePassAttachment nativePassAttachment = ref nativePassData.attachments[attIdx];
+
+                        if (nativePassAttachment.handle.type == RenderGraphResourceType.Texture)
+                        {
+                            ref ResourceUnversionedData resData = ref contextData.UnversionedResourceData(nativePassAttachment.handle);
+                            if (storeUVOrigin != TextureUVOriginSelection.Unknown && resData.textureUVOrigin != TextureUVOriginSelection.Unknown && resData.textureUVOrigin != storeUVOrigin)
+                            {
+                                ref NativePassAttachment firstStoreNativePassAttachment = ref nativePassData.attachments[firstStoreAttachmentIndex];
+                                var firstStoreAttachmentName = graph.m_ResourcesForDebugOnly.GetRenderGraphResourceName(firstStoreNativePassAttachment.handle);
+                                var name = graph.m_ResourcesForDebugOnly.GetRenderGraphResourceName(nativePassAttachment.handle);
+
+                                throw new InvalidOperationException($"From pass '{contextData.passNames[nativePassData.firstGraphPass]}' to pass '{contextData.passNames[nativePassData.lastGraphPass]}' when trying to store resource '{name}' of type {nativePassAttachment.handle.type} at index {nativePassAttachment.handle.index} - "
+                                                                    + RenderGraph.RenderGraphExceptionMessages.IncompatibleTextureUVOriginStore(firstStoreAttachmentName, storeUVOrigin, name, resData.textureUVOrigin));
+                            }
+
+                            resData.textureUVOrigin = storeUVOrigin;
+                        }
+                    }
+                }
+            }
+        }
+
         static bool IsGlobalTextureInPass(RenderGraphPass pass, ResourceHandle handle)
         {
             foreach (var g in pass.setGlobalsList)

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/ResourcesData.cs

@@ -36,10 +36,12 @@ internal struct ResourceUnversionedData
         public readonly bool discard; // graph.m_Resources.GetTextureResourceDesc(fragment.resource).discardBuffer;
         public readonly bool bindMS;
 
+        public TextureUVOriginSelection textureUVOrigin;
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public string GetName(CompilerContextData ctx, ResourceHandle h) => ctx.GetResourceName(h);
 
-        public ResourceUnversionedData(IRenderGraphResource rll, ref RenderTargetInfo info, ref TextureDesc desc, bool isResourceShared)
+        public ResourceUnversionedData(TextureResource rll, ref RenderTargetInfo info, ref TextureDesc desc, bool isResourceShared)
         {
             isImported = rll.imported;
             isShared = isResourceShared;
@@ -59,6 +61,7 @@ public ResourceUnversionedData(IRenderGraphResource rll, ref RenderTargetInfo in
             clear = desc.clearBuffer;
             discard = desc.discardBuffer;
             bindMS = info.bindMS;
+            textureUVOrigin = rll.textureUVOrigin;
         }
 
         public ResourceUnversionedData(IRenderGraphResource rll, ref BufferDesc _, bool isResourceShared)
@@ -83,6 +86,7 @@ public ResourceUnversionedData(IRenderGraphResource rll, ref BufferDesc _, bool
             clear = false;
             discard = false;
             bindMS = false;
+            textureUVOrigin = TextureUVOriginSelection.Unknown;
         }
 
         public ResourceUnversionedData(IRenderGraphResource rll, ref RayTracingAccelerationStructureDesc _, bool isResourceShared)
@@ -107,13 +111,15 @@ public ResourceUnversionedData(IRenderGraphResource rll, ref RayTracingAccelerat
             clear = false;
             discard = false;
             bindMS = false;
+            textureUVOrigin = TextureUVOriginSelection.Unknown;
         }
 
         public void InitializeNullResource()
         {
             firstUsePassID = -1;
             lastUsePassID = -1;
             lastWritePassID = -1;
+            textureUVOrigin = TextureUVOriginSelection.Unknown;
         }
     }
 
@@ -276,11 +282,12 @@ public void Initialize(RenderGraphResourceRegistry resources)
                     {
                         case (int)RenderGraphResourceType.Texture:
                             {
+                                var tex = rll as TextureResource;
                                 resources.GetRenderTargetInfo(h, out var info);
-                                ref var desc = ref (rll as TextureResource).desc;
+                                ref var desc = ref tex.desc;
                                 bool isResourceShared = resources.IsRenderGraphResourceShared(h);
 
-                                unversionedData[t][r] = new ResourceUnversionedData(rll, ref info, ref desc, isResourceShared);
+                                unversionedData[t][r] = new ResourceUnversionedData(tex, ref info, ref desc, isResourceShared);
                                 break;
                             }
                         case (int)RenderGraphResourceType.Buffer:

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.Compiler.cs

@@ -15,7 +15,7 @@ internal NativePassCompiler CompileNativeRenderGraph(int graphHash)
                 if (nativeCompiler == null)
                     nativeCompiler = new NativePassCompiler(m_CompilationCache);
 
-                bool compilationIsCached = nativeCompiler.Initialize(m_Resources, m_RenderPasses, m_DebugParameters, name, m_EnableCompilationCaching, graphHash, m_ExecutionCount);
+                bool compilationIsCached = nativeCompiler.Initialize(m_Resources, m_RenderPasses, m_DebugParameters, name, m_EnableCompilationCaching, graphHash, m_ExecutionCount, m_renderTextureUVOriginStrategy);
                 if (!compilationIsCached)
                     nativeCompiler.Compile(m_Resources);
 

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.ExceptionMessages.cs

@@ -113,6 +113,12 @@ internal static string UseDepthWithColorFormat(GraphicsFormat colorFormat) =>
             internal static string UseTransientTextureInWrongPass(int transientIndex) =>
                 $"This pass is using a transient resource from a different pass (pass index {transientIndex}). A transient resource should only be used in a single pass.";
 
+            internal static string IncompatibleTextureUVOrigin(TextureUVOriginSelection origin, string attachmentType, string attachmentName, RenderGraphResourceType attachmentResourceType, int attachmentResourceIndex, TextureUVOriginSelection attachmentOrigin) =>
+                $"TextureUVOrigin `{origin}` is not compatible with existing {attachmentType} attachment `{attachmentType}` of type `{attachmentResourceType}` at index `{attachmentResourceIndex}` with TextureUVOrigin `{attachmentOrigin}`";
+
+            internal static string IncompatibleTextureUVOriginUseTexture(TextureUVOriginSelection origin) =>
+                $"UseTexture() of a resource with `{origin}` is not compatible with Unity's standard UV origin for texture reading {TextureUVOrigin.BottomLeft}. Are you trying to UseTexture() on a backbuffer?";
+
             // RenderGraphPass
             internal const string k_MoreThanOneResourceForMRTIndex =
                 "You can only bind a single texture to a single index in a multiple render texture (MRT). Verify your indexes are correct.";
@@ -141,7 +147,7 @@ internal static string UseTransientTextureInWrongPass(int transientIndex) =>
 
             internal const string k_AttachmentsDoNotMatch =
                 "Low level rendergraph error: Attachments in renderpass do not match.";
-            
+
             internal const string k_MultisampledShaderResolveInvalidAttachmentSetup =
                 "Low level rendergraph error: last subpass with shader resolve must have one color attachment.";
 
@@ -165,6 +171,9 @@ internal static string UsingLegacyRenderGraph(string passName) =>
                 " You cannot use legacy passes with the Native Render Pass Compiler." +
                 " The APIs that are compatible with the Native Render Pass Compiler are AddUnsafePass, AddComputePass and AddRasterRenderPass.";
 
+            internal static string IncompatibleTextureUVOriginStore(string firstAttachmentName, TextureUVOriginSelection firstAttachmentOrigin, string secondAttachmentName, TextureUVOriginSelection secondAttachmentOrigin) =>
+                $"Texture attachment {firstAttachmentName} with uv origin {firstAttachmentOrigin} does not match with texture attachment {secondAttachmentName} with uv origin {secondAttachmentOrigin}. Storing both would result in contents being flipped.";
+
             internal static string GetExceptionMessage(RenderGraphState state)
             {
                 string caller = GetHigherCaller();