From 5f83485a1d51100dd5662a821a5485b38f5ffd4a Mon Sep 17 00:00:00 2001
From: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>
Date: Thu, 7 Oct 2021 11:00:28 -0700
Subject: [PATCH] PALify driver info. No warnings if info is empty. (#4533)

Signed-off-by: jiaweig <jiaweig@amazon.com>
---
 .../RHI.Reflect/PhysicalDeviceDescriptor.cpp  |  7 ++++++
 .../Android/PhysicalDeviceDriverInfo.setreg   | 23 +++++++++++++++++++
 .../Linux/PhysicalDeviceDriverInfo.setreg     | 23 +++++++++++++++++++
 .../Mac/PhysicalDeviceDriverInfo.setreg       | 23 +++++++++++++++++++
 .../Windows}/PhysicalDeviceDriverInfo.setreg  |  0
 .../iOS/PhysicalDeviceDriverInfo.setreg       | 23 +++++++++++++++++++
 6 files changed, 99 insertions(+)
 create mode 100644 Gems/Atom/RHI/Registry/Platform/Android/PhysicalDeviceDriverInfo.setreg
 create mode 100644 Gems/Atom/RHI/Registry/Platform/Linux/PhysicalDeviceDriverInfo.setreg
 create mode 100644 Gems/Atom/RHI/Registry/Platform/Mac/PhysicalDeviceDriverInfo.setreg
 rename Gems/Atom/RHI/Registry/{ => Platform/Windows}/PhysicalDeviceDriverInfo.setreg (100%)
 create mode 100644 Gems/Atom/RHI/Registry/Platform/iOS/PhysicalDeviceDriverInfo.setreg

diff --git a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
index 17819ab1f5..9da4f583ac 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/PhysicalDeviceDescriptor.cpp
@@ -86,6 +86,13 @@ namespace AZ
 
         PhysicalDeviceDriverValidator::ValidationResult PhysicalDeviceDriverValidator::ValidateDriverVersion(const PhysicalDeviceDescriptor& descriptor) const
         {
+            // [GFX TODO] Add driver info for other platforms besides Windows. Currently, avoid spamming warnings.
+            // ATOM-14967 [RHI][Metal] - Address driver version validator for Mac
+            if (m_driverInfo.size() == 0)
+            {
+                return ValidationResult::MissingInfo;
+            }
+
             auto iter = m_driverInfo.find(descriptor.m_vendorId);
 
             if (iter == m_driverInfo.end())
diff --git a/Gems/Atom/RHI/Registry/Platform/Android/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/Platform/Android/PhysicalDeviceDriverInfo.setreg
new file mode 100644
index 0000000000..a0df86c923
--- /dev/null
+++ b/Gems/Atom/RHI/Registry/Platform/Android/PhysicalDeviceDriverInfo.setreg
@@ -0,0 +1,23 @@
+//
+// 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
+//
+//
+//
+
+{
+    "O3DE":
+    {
+        "Atom":
+        {
+            "RHI":
+            {
+                "PhysicalDeviceDriverInfo":
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/RHI/Registry/Platform/Linux/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/Platform/Linux/PhysicalDeviceDriverInfo.setreg
new file mode 100644
index 0000000000..a0df86c923
--- /dev/null
+++ b/Gems/Atom/RHI/Registry/Platform/Linux/PhysicalDeviceDriverInfo.setreg
@@ -0,0 +1,23 @@
+//
+// 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
+//
+//
+//
+
+{
+    "O3DE":
+    {
+        "Atom":
+        {
+            "RHI":
+            {
+                "PhysicalDeviceDriverInfo":
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/RHI/Registry/Platform/Mac/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/Platform/Mac/PhysicalDeviceDriverInfo.setreg
new file mode 100644
index 0000000000..a0df86c923
--- /dev/null
+++ b/Gems/Atom/RHI/Registry/Platform/Mac/PhysicalDeviceDriverInfo.setreg
@@ -0,0 +1,23 @@
+//
+// 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
+//
+//
+//
+
+{
+    "O3DE":
+    {
+        "Atom":
+        {
+            "RHI":
+            {
+                "PhysicalDeviceDriverInfo":
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/Platform/Windows/PhysicalDeviceDriverInfo.setreg
similarity index 100%
rename from Gems/Atom/RHI/Registry/PhysicalDeviceDriverInfo.setreg
rename to Gems/Atom/RHI/Registry/Platform/Windows/PhysicalDeviceDriverInfo.setreg
diff --git a/Gems/Atom/RHI/Registry/Platform/iOS/PhysicalDeviceDriverInfo.setreg b/Gems/Atom/RHI/Registry/Platform/iOS/PhysicalDeviceDriverInfo.setreg
new file mode 100644
index 0000000000..a0df86c923
--- /dev/null
+++ b/Gems/Atom/RHI/Registry/Platform/iOS/PhysicalDeviceDriverInfo.setreg
@@ -0,0 +1,23 @@
+//
+// 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
+//
+//
+//
+
+{
+    "O3DE":
+    {
+        "Atom":
+        {
+            "RHI":
+            {
+                "PhysicalDeviceDriverInfo":
+                {
+                }
+            }
+        }
+    }
+}