Cherrypicked fix for "Failed to find builder dependency" error message.

Cherrypicked fix for "Failed to find builder dependency" error message.

Merge pull request #1507 from aws-lumberyard-dev/santorac/Cherrypick-ATOM-15134-ATOM-15136

Cherrypicked b7f6b57e16 from stabilization branch because I knew it would have conflicts I needed to resolve.

See https://github.com/aws-lumberyard/o3de/pull/1462

This removes mostly benign (but noisy) messages about "Failed to find builder dependency".

ATOM-15136 Builder dependency errors reported in mainline
ATOM-15134 Replace GetPossibleDepenencyPaths Approach with Source Dependencies

- SrgLayoutBuilder.cpp conflicted because it had been removed on development. The changes in this file are no longer relevant.
- ShaderVariantAssetBuilder.cpp conflicted only because there were formatting changes inside the AddShaderAssetJobDependency() function.
- There was also an inderect merge conflict where there was some new code using the AddShaderAssetJobDependency function that I replaced on the stabilization branch. So I updated the new code to use LocateReferencedSourceFile too.

Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp

@@ -65,23 +65,46 @@ namespace AZ
     {
         static constexpr char ShaderVariantAssetBuilderName[] = "ShaderVariantAssetBuilder";
 
-        static void AddShaderAssetJobDependency(
-            AssetBuilderSDK::JobDescriptor& jobDescriptor, const AssetBuilderSDK::PlatformInfo& platformInfo,
-            const AZStd::string& shaderVariantListFilePath, const AZStd::string& shaderFilePath)
+        //! Adds source file dependencies for every place a referenced file may appear, and detects if one of
+        //! those possible paths resolves to the expected file.
+        //! @param currentFilePath - the full path to the file being processed
+        //! @param referencedParentPath - the path to a reference file, which may be relative to the @currentFilePath, or may be a full asset path.
+        //! @param sourceFileDependencies - new source file dependencies will be added to this list
+        //! @param foundSourceFile - if one of the source file dependencies is found, the highest priority one will be indicated here, otherwise this will be empty.
+        //! @return true if the referenced file was found and @foundSourceFile was set
+        bool LocateReferencedSourceFile(
+            AZStd::string_view currentFilePath, AZStd::string_view referencedParentPath,
+            AZStd::vector<AssetBuilderSDK::SourceFileDependency>& sourceFileDependencies,
+            AZStd::string& foundSourceFile)
         {
-            AZStd::vector<AZStd::string> possibleDependencies =
-                AZ::RPI::AssetUtils::GetPossibleDepenencyPaths(shaderVariantListFilePath, shaderFilePath);
+            foundSourceFile.clear();
+
+            bool found = false;
+
+            AZStd::vector<AZStd::string> possibleDependencies = RPI::AssetUtils::GetPossibleDepenencyPaths(currentFilePath, referencedParentPath);
             for (auto& file : possibleDependencies)
             {
-                AssetBuilderSDK::JobDependency jobDependency;
-                jobDependency.m_jobKey = ShaderAssetBuilder::ShaderAssetBuilderJobKey;
-                jobDependency.m_platformIdentifier = platformInfo.m_identifier;
-                jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
-                jobDependency.m_sourceFile.m_sourceFileDependencyPath = file;
-                jobDescriptor.m_jobDependencyList.push_back(jobDependency);
+                AssetBuilderSDK::SourceFileDependency sourceFileDependency;
+                sourceFileDependency.m_sourceFileDependencyPath = file;
+                sourceFileDependencies.push_back(sourceFileDependency);
+
+                if (!found)
+                {
+                    AZ::Data::AssetInfo sourceInfo;
+                    AZStd::string watchFolder;
+                    AzToolsFramework::AssetSystemRequestBus::BroadcastResult(found, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, file.c_str(), sourceInfo, watchFolder);
+
+                    if (found)
+                    {
+                        foundSourceFile = file;
+                    }
+                }
             }
+
+            return found;
         }
 
+
         //! Returns true if @sourceFileFullPath starts with a valid asset processor scan folder, false otherwise.
         //! In case of true, it splits @sourceFileFullPath into @scanFolderFullPath and @filePathFromScanFolder.
         //! @sourceFileFullPath The full path to a source asset file.
@@ -288,6 +311,9 @@ namespace AZ
                 response.m_result = AssetBuilderSDK::CreateJobsResultCode::Failed;
                 return;
             }
+            
+            AZStd::string foundShaderFile;
+            LocateReferencedSourceFile(variantListFullPath, shaderVariantList.m_shaderFilePath, response.m_sourceFileDependencyList, foundShaderFile);
 
             if (loadResult.m_code == LoadResult::Code::DeferredError || shouldExitEarlyFromProcessJob)
             {
@@ -300,8 +326,16 @@ namespace AZ
                     jobDescriptor.m_critical = false;
                     jobDescriptor.m_jobKey = ShaderVariantAssetBuilderJobKey;
                     jobDescriptor.SetPlatformIdentifier(info.m_identifier.data());
-
-                    AddShaderAssetJobDependency(jobDescriptor, info, variantListFullPath, shaderVariantList.m_shaderFilePath);
+                    
+                    if (!foundShaderFile.empty())
+                    {
+                        AssetBuilderSDK::JobDependency jobDependency;
+                        jobDependency.m_jobKey = ShaderAssetBuilder::ShaderAssetBuilderJobKey;
+                        jobDependency.m_platformIdentifier = info.m_identifier;
+                        jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
+                        jobDependency.m_sourceFile.m_sourceFileDependencyPath = foundShaderFile;
+                        jobDescriptor.m_jobDependencyList.push_back(jobDependency);
+                    }
 
                     if (loadResult.m_code == LoadResult::Code::DeferredError)
                     {
@@ -321,7 +355,7 @@ namespace AZ
                 response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
                 return;
             }
-
+            
             for (const AssetBuilderSDK::PlatformInfo& info : request.m_enabledPlatforms)
             {
                 AZ_TraceContext("For platform", info.m_identifier.data());
@@ -336,8 +370,16 @@ namespace AZ
                 
                     jobDescriptor.m_jobKey = GetShaderVariantTreeAssetJobKey();
                     jobDescriptor.SetPlatformIdentifier(info.m_identifier.data());
-                
-                    AddShaderAssetJobDependency(jobDescriptor, info, variantListFullPath, shaderVariantList.m_shaderFilePath);
+
+                    if (!foundShaderFile.empty())
+                    {
+                        AssetBuilderSDK::JobDependency jobDependency;
+                        jobDependency.m_jobKey = ShaderAssetBuilder::ShaderAssetBuilderJobKey;
+                        jobDependency.m_platformIdentifier = info.m_identifier;
+                        jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
+                        jobDependency.m_sourceFile.m_sourceFileDependencyPath = foundShaderFile;
+                        jobDescriptor.m_jobDependencyList.push_back(jobDependency);
+                    }
                 
                     jobDescriptor.m_jobParameters.emplace(ShaderSourceFilePathJobParam, shaderSourceFileFullPath);
                 

Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h

@@ -63,6 +63,7 @@ namespace AZ
             //! it's possible that b.json could be found in either MyGem/Assets/Foo/Bar/a.json or in MyGem/Assets/Bar/a.json.
             //! @param originatingSourceFilePath  Path to a file that references referencedSourceFilePath. May be absolute or relative to asset-root.
             //! @param referencedSourceFilePath   The referenced path as it appears in the originating file. May be relative to the originating file location or relative to asset-root.
+            //! @return the list of possible paths, ordered from highest priority to lowest priority
             AZStd::vector<AZStd::string> GetPossibleDepenencyPaths(const AZStd::string& originatingSourceFilePath, const AZStd::string& referencedSourceFilePath);
 
             // Definitions...

Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp

@@ -66,16 +66,41 @@ namespace AZ
             BusDisconnect();
         }
 
-        void AddPossibleJobDependencies(const char* jobKey, AZStd::string_view currentFilePath, AZStd::string_view referencedParentPath, AZStd::vector<AssetBuilderSDK::JobDependency>& jobDependencies)
+        //! Adds all relevant dependencies for a referenced source file, considering that the path might be relative to the original file location or a full asset path.
+        //! This will usually include multiple source dependencies and a single job dependency, but will include only source dependencies if the file is not found.
+        //! Note the AssetBuilderSDK::JobDependency::m_platformIdentifier will not be set by this function. The calling code must set this value before passing back
+        //! to the AssetBuilderSDK::CreateJobsResponse.
+        void AddPossibleDependencies(
+            AZStd::string_view currentFilePath, AZStd::string_view referencedParentPath,
+            AZStd::vector<AssetBuilderSDK::SourceFileDependency>& sourceFileDependencies,
+            const char* jobKey, AZStd::vector<AssetBuilderSDK::JobDependency>& jobDependencies)
         {
-            AZStd::vector<AZStd::string> possibleDependencies = AssetUtils::GetPossibleDepenencyPaths(currentFilePath, referencedParentPath);
+            bool dependencyFileFound = false;
+
+            AZStd::vector<AZStd::string> possibleDependencies = RPI::AssetUtils::GetPossibleDepenencyPaths(currentFilePath, referencedParentPath);
             for (auto& file : possibleDependencies)
             {
-                AssetBuilderSDK::JobDependency jobDependency;
-                jobDependency.m_jobKey = jobKey;
-                jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
-                jobDependency.m_sourceFile.m_sourceFileDependencyPath = file;
-                jobDependencies.push_back(jobDependency);
+                AssetBuilderSDK::SourceFileDependency sourceFileDependency;
+                sourceFileDependency.m_sourceFileDependencyPath = file;
+                sourceFileDependencies.push_back(sourceFileDependency);
+
+                // The first path found is the highest priority, and will have a job dependency, as this is the one
+                // the builder will actually use
+                if (!dependencyFileFound)
+                {
+                    AZ::Data::AssetInfo sourceInfo;
+                    AZStd::string watchFolder;
+                    AzToolsFramework::AssetSystemRequestBus::BroadcastResult(dependencyFileFound, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, file.c_str(), sourceInfo, watchFolder);
+
+                    if (dependencyFileFound)
+                    {
+                        AssetBuilderSDK::JobDependency jobDependency;
+                        jobDependency.m_jobKey = jobKey;
+                        jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
+                        jobDependency.m_sourceFile.m_sourceFileDependencyPath = file;
+                        jobDependencies.push_back(jobDependency);
+                    }
+                }
             }
         }
 
@@ -122,7 +147,7 @@ namespace AZ
             // We'll build up this one JobDescriptor and reuse it to register each of the platforms
             AssetBuilderSDK::JobDescriptor outputJobDescriptor;
             outputJobDescriptor.m_jobKey = JobKey;
-
+            
             // Load the file so we can detect and report dependencies.
             // If the file is a .materialtype, report dependencies on the .shader files.
             // If the file is a .material, report a dependency on the .materialtype and parent .material file
@@ -151,7 +176,9 @@ namespace AZ
 
                     for (auto& shader : materialTypeSourceData.GetValue().m_shaderCollection)
                     {
-                        AddPossibleJobDependencies("Shader Asset", request.m_sourceFile, shader.m_shaderFilePath, outputJobDescriptor.m_jobDependencyList);
+                        AddPossibleDependencies(request.m_sourceFile, shader.m_shaderFilePath,
+                            response.m_sourceFileDependencyList, "Shader Asset",
+                            outputJobDescriptor.m_jobDependencyList);
                     }
 
                     for (auto& functor : materialTypeSourceData.GetValue().m_materialFunctorSourceData)
@@ -160,7 +187,9 @@ namespace AZ
 
                         for (const MaterialFunctorSourceData::AssetDependency& dependency : dependencies)
                         {
-                            AddPossibleJobDependencies(dependency.m_jobKey.c_str(), request.m_sourceFile, dependency.m_sourceFilePath, outputJobDescriptor.m_jobDependencyList);
+                            AddPossibleDependencies(request.m_sourceFile, dependency.m_sourceFilePath,
+                                response.m_sourceFileDependencyList,
+                                dependency.m_jobKey.c_str(), outputJobDescriptor.m_jobDependencyList);
                         }
                     }
                 }
@@ -195,7 +224,9 @@ namespace AZ
 
                     // Register dependency on the parent material source file so we can load it and use it's data to build this variant material.
                     // Note, we don't need a direct dependency on the material type because the parent material will depend on it.
-                    AddPossibleJobDependencies(JobKey, request.m_sourceFile, parentMaterialPath, outputJobDescriptor.m_jobDependencyList);
+                    AddPossibleDependencies(request.m_sourceFile, parentMaterialPath,
+                        response.m_sourceFileDependencyList,
+                        JobKey, outputJobDescriptor.m_jobDependencyList);
                 }
             }
             

Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp

@@ -103,31 +103,16 @@ namespace AZ
 
             AZStd::vector<AZStd::string> GetPossibleDepenencyPaths(const AZStd::string& originatingSourceFilePath, const AZStd::string& referencedSourceFilePath)
             {
-                // We potentially add the parent dependency as both a direct path and a relative path rather than use AssetUtils::ResolvePathReference
-                // because there is no guarantee that the Asset Processor has seen the parent file yet (which ResolvePathReference requires).
-                // In that case, we have to add both possible locations because we don't know where it will show up.
-
                 AZStd::vector<AZStd::string> results;
 
-                // The first dependency we add is using the referencedSourceFilePath as a relative path. This gives relative paths priority over asset-root paths.
+                // Use the referencedSourceFilePath as a relative path starting at originatingSourceFilePath
                 AZStd::string combinedPath = originatingSourceFilePath;
                 AzFramework::StringFunc::Path::StripFullName(combinedPath);
                 AzFramework::StringFunc::Path::Join(combinedPath.c_str(), referencedSourceFilePath.c_str(), combinedPath);
                 results.push_back(combinedPath);
 
-                // If the parent file exists at the relative path, then there is no need to report a dependency on the asset-root path.
-                bool assetFound = false;
-                AZ::Data::AssetInfo sourceInfo;
-                AZStd::string watchFolder;
-                AzToolsFramework::AssetSystemRequestBus::BroadcastResult(assetFound, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, combinedPath.c_str(), sourceInfo, watchFolder);
-
-                if (!assetFound)
-                {
-                    // The parent file wasn't found at the relative path, so we need a dependency on the asset-root path in case the file
-                    // exists there. Note, we still keep the relative path dependency above because we don't know whether it's missing because
-                    // it doesn't exist, or just because the AP hasn't found it yet.
-                    results.push_back(referencedSourceFilePath);
-                }
+                // Use the referencedSourceFilePath as a standard asset path
+                results.push_back(referencedSourceFilePath);
 
                 return results;
             }