Remove now unused Environment `Create`/`Destroy`/`Attach`/`Detach`/`IsReady` methods

Signed-off-by: Chris Burel <[email protected]>

Code/Editor/CryEdit.h

@@ -471,7 +471,7 @@ namespace AzToolsFramework
 
 } // namespace AzToolsFramework
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env);
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule();
 extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule();
 
 #endif // CRYINCLUDE_EDITOR_CRYEDIT_H

Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp

@@ -67,7 +67,7 @@ AZStd::unique_ptr<AZ::DynamicModuleHandle> AssetImporterPlugin::LoadSceneLibrary
             auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
             if (init)
             {
-                (*init)(AZ::Environment::GetInstance());
+                (*init)();
             }
         }
 

Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.cpp

@@ -45,7 +45,7 @@ namespace AZ
             {
                 // if we get here, it means nobody has initialized this module yet.  We will initialize it and create the variable.
                 m_initialized = AZ::Environment::CreateVariable<bool>(variableName.c_str());
-                initFunc(AZ::Environment::GetInstance());
+                initFunc();
             }
         }
         else if (isInitializeFunctionRequired)

Code/Framework/AzCore/AzCore/Module/DynamicModuleHandle.h

@@ -105,7 +105,7 @@ namespace AZ
     /// The very first function invoked in a dynamic module.
     /// Implementations should attach to the environment.
     /// \param sharedEnvironment is an \ref AZ::EnvironmentInstance.
-    using InitializeDynamicModuleFunction = void(*)(void* sharedEnvironment);
+    using InitializeDynamicModuleFunction = void(*)();
     const char InitializeDynamicModuleFunctionName[] = "InitializeDynamicModule";
 
     /// \code

Code/Framework/AzCore/AzCore/Module/Environment.cpp

@@ -122,8 +122,6 @@ namespace AZ
             using MapType = AZStd::unordered_map<u32, void *, AZStd::hash<u32>, AZStd::equal_to<u32>, OSStdAllocator>;
 
             static EnvironmentInterface* Get();
-            static void Attach(EnvironmentInstance sourceEnvironment, bool useAsGetFallback);
-            static void Detach();
 
             EnvironmentImpl(Environment::AllocatorInterface* allocator)
                 : m_variableMap(MapType::hasher(), MapType::key_eq(), OSStdAllocator(allocator))
@@ -357,14 +355,6 @@ namespace AZ
             return &environment;
         }
 
-        void EnvironmentImpl::Attach([[maybe_unused]] EnvironmentInstance sourceEnvironment, [[maybe_unused]] bool useAsGetFallback)
-        {
-        }
-
-        void EnvironmentImpl::Detach()
-        {
-        }
-
         O3DEKERNEL_API EnvironmentVariableResult AddAndAllocateVariable(u32 guid, size_t byteSize, size_t alignment, AZStd::recursive_mutex** addedVariableLock)
         {
             return EnvironmentImpl::Get()->AddAndAllocateVariable(guid, byteSize, alignment, addedVariableLock);
@@ -388,31 +378,9 @@ namespace AZ
 
     namespace Environment
     {
-        O3DEKERNEL_API bool IsReady()
-        {
-            return true;
-        }
-
         O3DEKERNEL_API EnvironmentInstance GetInstance()
         {
             return Internal::EnvironmentImpl::Get();
         }
-
-        O3DEKERNEL_API bool Create([[maybe_unused]] AllocatorInterface* allocator)
-        {
-            return true;
-        }
-
-        O3DEKERNEL_API void Destroy()
-        {
-        }
-
-        O3DEKERNEL_API void Detach()
-        {
-        }
-
-        O3DEKERNEL_API void Attach([[maybe_unused]] EnvironmentInstance sourceEnvironment, [[maybe_unused]] bool useAsGetFallback)
-        {
-        }
     } // namespace Environment
 } // namespace AZ

Code/Framework/AzCore/AzCore/Module/Environment.h

@@ -117,36 +117,7 @@ namespace AZ
             static const bool uniqueMemoryAddress{};
             return &uniqueMemoryAddress;
         }
-
-        /**
-         * Create Environment with customer allocator interface. You don't have to call create or destroy as they will
-         * created on demand, but is such case the module allocator will used. For example on Windows if you link the CRT
-         * two environments will end up on different heaps.
-         * \returns true if Create was successful, false if environment is already created/attached.
-         */
-        O3DEKERNEL_API bool Create(AllocatorInterface* allocator);
-
-        /**
-         * Explicit Destroy, you don't have to call it unless you want to control order. It will be called when the module is unloaded.
-         * Of course no order is guaranteed.
-         */
-        O3DEKERNEL_API void Destroy();
-
-        /**
-         * Attaches the current module environment from sourceEnvironment.
-         * note: this is not a copy it will actually reference the source environment, so any variables
-         * you add remove will be visible to all shared modules
-         * \param useAsFallback if set to true a new environment will be created and only failures to GetVariable
-         * which check the shared environment. This way you can change the environment.
-         */
-        O3DEKERNEL_API void Attach(EnvironmentInstance sourceEnvironment, bool useAsGetFallback = false);
-
-        /// Detaches the active environment (if one is attached)
-        O3DEKERNEL_API void Detach();
-
-        /// Returns true if an environment is attached to this module
-        O3DEKERNEL_API bool IsReady();
-    };
+    } // namespace Environment
 
     namespace Internal
     {
@@ -629,15 +600,6 @@ namespace AZ
     {
         return FindVariable<T>(AZ::Internal::EnvironmentVariableNameToId(uniqueName));
     }
-
-    namespace Internal
-    {
-        inline void AttachGlobalEnvironment(void* globalEnv)
-        {
-            AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(globalEnv));
-        }
-    }
-
 } // namespace AZ
 
 #ifdef AZ_MONOLITHIC_BUILD
@@ -650,11 +612,10 @@ namespace AZ
 /// For more details see:
 /// \ref AZ::InitializeDynamicModuleFunction, \ref AZ::UninitializeDynamicModuleFunction
 #define AZ_DECLARE_MODULE_INITIALIZATION \
-    extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env) \
+    extern "C" AZ_DLL_EXPORT void InitializeDynamicModule() \
     { \
-        AZ::Internal::AttachGlobalEnvironment(env); \
     } \
-    extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule() { AZ::Environment::Detach(); }
+    extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule() { }
 
 #endif // AZ_MONOLITHIC_BUILD
 

Code/Framework/AzCore/Tests/DLLMainTest.cpp

@@ -105,9 +105,8 @@ extern "C" AZ_DLL_EXPORT void DestroyDLLTestVirtualClass()
 //////////////////////////////////////////////////////////////////////////
 
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* azEnvironmentInstance)
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
-    AZ_Assert(AZ::Environment::GetInstance() == azEnvironmentInstance, "Invalid!");
     AZ_Printf("DLL", "InitializeDynamicModule called");
 }
 

Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp

@@ -101,7 +101,7 @@ namespace AZ
     } // namespace SceneAPI
 } // namespace AZ
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* /*env*/)
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
 }
 extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)

Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp

@@ -29,7 +29,7 @@ protected:
         AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneCore module.");
         auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
         AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneCore module.");
-        (*init)(AZ::Environment::GetInstance());
+        (*init)();
 
         sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData");
         AZ_Assert(sceneDataModule, "SceneData unit tests failed to create SceneData module.");
@@ -37,7 +37,7 @@ protected:
         AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneData module.");
         init = sceneDataModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
         AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneData module.");
-        (*init)(AZ::Environment::GetInstance());
+        (*init)();
     }
 
     void TeardownEnvironment() override

Code/Tools/SceneAPI/SceneCore/DllMain.cpp

@@ -286,7 +286,7 @@ namespace AZ
 
 static bool g_sceneCoreInitialized = false;
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* /*env*/)
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
     if (g_sceneCoreInitialized)
     {

Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.cpp

@@ -16,7 +16,7 @@ namespace AZ
     {
         bool SceneCoreStandaloneAllocator::m_allocatorInitialized = false;
 
-        void SceneCoreStandaloneAllocator::Initialize(AZ::EnvironmentInstance /*environment*/)
+        void SceneCoreStandaloneAllocator::Initialize()
         {
             if (!AZ::AllocatorInstance<AZ::SystemAllocator>().IsReady())
             {

Code/Tools/SceneAPI/SceneCore/SceneCoreStandaloneAllocator.h

@@ -17,7 +17,7 @@ namespace AZ
         class SceneCoreStandaloneAllocator
         {
         public:
-            SCENE_CORE_API static void Initialize(AZ::EnvironmentInstance environment);
+            SCENE_CORE_API static void Initialize();
             SCENE_CORE_API static void TearDown();
 
         private:

Code/Tools/SceneAPI/SceneCore/Tests/TestsMain.cpp

@@ -19,7 +19,7 @@ public:
 protected:
     void SetupEnvironment() override
     {
-        AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize(AZ::Environment::GetInstance());
+        AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize();
     }
 
     void TeardownEnvironment() override

Code/Tools/SceneAPI/SceneData/DllMain.cpp

@@ -108,7 +108,7 @@ namespace AZ {
 
 static bool g_sceneDataInitialized = false;
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* /*env*/)
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
     if (g_sceneDataInitialized)
     {

Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.cpp

@@ -16,7 +16,7 @@ namespace AZ
     {
         bool SceneDataStandaloneAllocator::m_allocatorInitialized = false;
 
-        void SceneDataStandaloneAllocator::Initialize(AZ::EnvironmentInstance /*environment*/)
+        void SceneDataStandaloneAllocator::Initialize()
         {
             if (!AZ::AllocatorInstance<AZ::SystemAllocator>().IsReady())
             {

Code/Tools/SceneAPI/SceneData/SceneDataStandaloneAllocator.h

@@ -17,7 +17,7 @@ namespace AZ
         class SceneDataStandaloneAllocator
         {
         public:
-            SCENE_DATA_API static void Initialize(AZ::EnvironmentInstance environment);
+            SCENE_DATA_API static void Initialize();
             SCENE_DATA_API static void TearDown();
 
         private:

Code/Tools/SceneAPI/SceneData/Tests/TestsMain.cpp

@@ -21,7 +21,7 @@ public:
 protected:
     void SetupEnvironment() override
     {
-        AZ::SceneAPI::SceneDataStandaloneAllocator::Initialize(AZ::Environment::GetInstance());
+        AZ::SceneAPI::SceneDataStandaloneAllocator::Initialize();
 
         sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
         AZ_Assert(sceneCoreModule, "SceneData unit tests failed to create SceneCore module.");
@@ -29,7 +29,7 @@ protected:
         AZ_Assert(loaded, "SceneData unit tests failed to load SceneCore module.");
         auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
         AZ_Assert(init, "SceneData unit tests failed to find the initialization function the SceneCore module.");
-        (*init)(AZ::Environment::GetInstance());
+        (*init)();
     }
 
     void TeardownEnvironment() override

Code/Tools/SceneAPI/SceneUI/DllMain.cpp

@@ -22,7 +22,7 @@
 static AZ::SceneAPI::UI::GraphMetaInfoHandler* g_graphMetaInfoHandler = nullptr;
 static AZ::SceneAPI::UI::ManifestMetaInfoHandler* g_manifestMetaInfoHandler = nullptr;
 
-extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* /*env*/)
+extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
     AZ::SceneAPI::UI::HeaderHandler::Register();
     AZ::SceneAPI::UI::NodeListSelectionHandler::Register();

Gems/EMotionFX/Code/Tests/InitSceneAPIFixture.h

@@ -39,7 +39,7 @@ namespace EMotionFX
                 ASSERT_TRUE(loaded) << "EMotionFX Editor unit tests failed to load " << moduleName.c_str() << " module.";
                 auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
                 ASSERT_TRUE(init) << "EMotionFX Editor unit tests failed to find the initialization function the " << moduleName.c_str() << " module.";
-                (*init)(AZ::Environment::GetInstance());
+                (*init)();
 
                 m_modules.emplace_back(AZStd::move(module));
             }

Gems/NvCloth/Code/Tests/Pipeline/SceneAPIExt/ClothRuleTest.cpp

@@ -38,7 +38,7 @@ namespace UnitTest
 
     void NvClothRule::SetUpTestCase()
     {
-        AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize(AZ::Environment::GetInstance()); // Allocator needed by SceneCore
+        AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize(); // Allocator needed by SceneCore
     }
 
     void NvClothRule::TearDownTestCase()

Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabBehaviorTests.cpp

@@ -82,8 +82,8 @@ namespace UnitTest
             {
                 AZ::AllocatorInstance<AZ::SystemAllocator>().Create();
             }
-            AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize(AZ::Environment::GetInstance());
-            AZ::SceneAPI::SceneDataStandaloneAllocator::Initialize(AZ::Environment::GetInstance());
+            AZ::SceneAPI::SceneCoreStandaloneAllocator::Initialize();
+            AZ::SceneAPI::SceneDataStandaloneAllocator::Initialize();
         }
 
         static void TearDownTestCase()

Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp

@@ -95,7 +95,7 @@ namespace AZ
                         auto init = module->GetFunction<InitializeDynamicModuleFunction>(InitializeDynamicModuleFunctionName);
                         if (init)
                         {
-                            (*init)(AZ::Environment::GetInstance());
+                            (*init)();
                         }
                     }
                 }

Gems/SceneProcessing/Code/Tests/InitSceneAPIFixture.h

@@ -37,7 +37,7 @@ namespace SceneProcessing
                 ASSERT_TRUE(loaded) << "EMotionFX Editor unit tests failed to load " << moduleName.c_str() << " module.";
                 auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
                 ASSERT_TRUE(init) << "EMotionFX Editor unit tests failed to find the initialization function the " << moduleName.c_str() << " module.";
-                (*init)(AZ::Environment::GetInstance());
+                (*init)();
 
                 m_modules.emplace_back(AZStd::move(module));
             }

Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp

@@ -179,7 +179,7 @@ private:
         module->Load(false);
         if (auto init = module->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName); init)
         {
-            AZStd::invoke(init, AZ::Environment::GetInstance());
+            AZStd::invoke(init);
         }
         return module;
     }