- Adding missing Module code for RHI Vulkan Builder (Fix error related to DynamicModuleHandle not being discovered during Gem Load)

- Re-ordered build dependencies for Atom_RHI_Vulkan builder to resolve linker undefined references in Linux
2021-04-23 15:43:48 -07:00
parent b492f59512
commit 6dc0d846d6
6 changed files with 54 additions and 4 deletions
@@ -188,11 +188,11 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
        BUILD_DEPENDENCIES
            PRIVATE
                AZ::AzCore
-                Gem::Atom_RHI.Edit
                Gem::Atom_RHI.Reflect
                Gem::Atom_RHI.Public
                Gem::Atom_RHI_Vulkan.Reflect
                Gem::Atom_RHI_Vulkan.Builders.Static
+                Gem::Atom_RHI.Edit
    )

 endif()
@@ -0,0 +1,51 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h>
+#include <Atom/RHI.Reflect/ReflectSystemComponent.h>
+#include <AzCore/Module/Module.h>
+#include <RHI.Builders/ShaderPlatformInterfaceSystemComponent.h>
+
+namespace AZ
+{
+    namespace Vulkan
+    {
+        
+        //! Exposes Vulkan RHI Building components to the Asset Processor.
+        class BuilderModule final
+            : public AZ::Module
+        {
+        public:
+            AZ_RTTI(BuilderModule, "{C22CF1CB-59AA-4247-A983-BC371A7B0513}", AZ::Module);
+
+            BuilderModule()
+            {
+                m_descriptors.insert(m_descriptors.end(), {
+                    ShaderPlatformInterfaceSystemComponent::CreateDescriptor()
+                });
+            }
+
+            AZ::ComponentTypeList GetRequiredSystemComponents() const override
+            {
+                return
+                {
+                    azrtti_typeid<ShaderPlatformInterfaceSystemComponent>(),
+                };
+            }
+        };
+    } // namespace Vulkan
+} // namespace AZ
+
+// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
+// The first parameter should be GemName_GemIdLower
+// The second should be the fully qualified name of the class above
+AZ_DECLARE_MODULE_CLASS(Gem_Atom_RHI_Vulkan_Builders, AZ::Vulkan::BuilderModule);
@@ -11,7 +11,7 @@
 */
 #pragma once

-#define AZ_TRAIT_ATOM_SHADERBUILDER_DXC "Builders/DirectXShaderCompilerAz/dxc.exe"
+#define AZ_TRAIT_ATOM_SHADERBUILDER_DXC "Builders/DirectXShaderCompilerAz/bin/dxc"
 #define AZ_TRAIT_ATOM_VULKAN_DISABLE_DUAL_SOURCE_BLENDING 0
 #define AZ_TRAIT_ATOM_VULKAN_DLL ""
 #define AZ_TRAIT_ATOM_VULKAN_DLL_1 ""
@@ -10,4 +10,5 @@
 #

 set(FILES
+    RHI.Builders/BuilderModule_Linux.cpp
 )
@@ -10,5 +10,4 @@
 #

 set(FILES
-    ../Common/Unimplemented/Empty_Unimplemented.cpp
 )
@@ -10,5 +10,4 @@
 #

 set(FILES
-    ../Common/Unimplemented/Empty_Unimplemented.cpp
 )