Merge pull request #544 from aws-lumberyard-dev/Atom/santorac/MaterialHotReloadTestLinuxFix

Fixes to get MaterialHotReloadTest working on Linux.

Gem/Code/Source/MaterialHotReloadTestComponent.cpp

@@ -258,7 +258,7 @@ namespace AtomSampleViewer
 
     AzFramework::AssetSystem::AssetStatus MaterialHotReloadTestComponent::GetTestAssetStatus(const char* tempSourceFile) const
     {
-        AZStd::string filePath = AZStd::string("materials/hotreloadtest/temp/") + tempSourceFile;
+        AZStd::string filePath = AZStd::string("Materials/HotReloadTest/Temp/") + tempSourceFile;
 
         AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus::AssetStatus_Unknown;
         AzFramework::AssetSystemRequestBus::BroadcastResult(status, &AzFramework::AssetSystem::AssetSystemRequests::GetAssetStatusSearchType,

Materials/HotReloadTest/TestData/AZSL_HorizontalPattern.txt

@@ -6,7 +6,7 @@
  */
 
 #include <viewsrg.srgi>
-#include <Atom/Features/PBR/ForwardPassSrg.azsli>
+#include <Atom/Features/Pipeline/Forward/ForwardPassSrg.azsli>
 #include <Atom/Features/PBR/DefaultObjectSrg.azsli>
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 

Materials/HotReloadTest/TestData/AZSL_VerticalPattern.txt

@@ -6,7 +6,7 @@
  */
 
 #include <viewsrg.srgi>
-#include <Atom/Features/PBR/ForwardPassSrg.azsli>
+#include <Atom/Features/Pipeline/Forward/ForwardPassSrg.azsli>
 #include <Atom/Features/PBR/DefaultObjectSrg.azsli>
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 

Standalone/Platform/Linux/AtomSampleViewerApplication_linux.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AtomSampleViewerApplication.h>
+
+namespace AtomSampleViewer
+{
+    const bool AtomSampleViewerApplication::s_connectToAssetProcessor = true;
+
+    void AtomSampleViewerApplication::SetupConsoleHandlerRoutine()
+    {
+    }
+} // namespace AtomSampleViewer

Standalone/Platform/Linux/platform_linux_files.cmake

@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    ../Common/AtomSampleViewerApplication_common.cpp
+    AtomSampleViewerApplication_linux.cpp
     main_linux.cpp
 )