Merge pull request #403 from novelrt/bugfix/input-nullptr-fix

Input nullptr fix.
novelrt · Feb 5, 2022 · 609e507 · 609e507
2 parents 267af65 + 0fe3624
commit 609e507
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/include/NovelRT/Graphics/Vulkan/VulkanGraphicsPluginProvider.h b/include/NovelRT/Graphics/Vulkan/VulkanGraphicsPluginProvider.h
@@ -8,7 +8,7 @@ namespace NovelRT::Graphics::Vulkan
 {
     class VulkanGraphicsPluginProvider final : public PluginManagement::IGraphicsPluginProvider
     {
-    private:
+    protected:
         NovelRT::Utilities::Lazy<std::shared_ptr<VulkanGraphicsProvider>> _graphicsProvider;
 
         [[nodiscard]] std::shared_ptr<VulkanGraphicsProvider> CreateVulkanGraphicsProviderInternal();

diff --git a/include/NovelRT/Input/Glfw/GlfwInputPluginProvider.h b/include/NovelRT/Input/Glfw/GlfwInputPluginProvider.h
@@ -12,7 +12,7 @@ namespace NovelRT::Input::Glfw
 {
     class GlfwInputPluginProvider final : public PluginManagement::IInputPluginProvider
     {
-    private:
+    protected:
         std::shared_ptr<GlfwInputDevice> _inputDevice;
 
         [[nodiscard]] GlfwInputDevice* GetInputDeviceInternal() override;

diff --git a/include/NovelRT/PluginManagement/IGraphicsPluginProvider.h b/include/NovelRT/PluginManagement/IGraphicsPluginProvider.h
@@ -12,7 +12,7 @@ namespace NovelRT::PluginManagement
 {
     class IGraphicsPluginProvider
     {
-    private:
+    protected:
         [[nodiscard]] virtual Graphics::GraphicsProvider* GetGraphicsProviderInternal() = 0;
 
     public:

diff --git a/include/NovelRT/PluginManagement/IInputPluginProvider.h b/include/NovelRT/PluginManagement/IInputPluginProvider.h
@@ -12,7 +12,7 @@ namespace NovelRT::PluginManagement
 {
     class IInputPluginProvider
     {
-    private:
+    protected:
         [[nodiscard]] virtual NovelRT::Input::IInputDevice* GetInputDeviceInternal() = 0;
 
     public:

diff --git a/samples/EcsPipeline/main.cpp b/samples/EcsPipeline/main.cpp
@@ -19,6 +19,7 @@ int main()
             .WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IGraphicsPluginProvider>())
             .WithPluginProvider(windowingProvider)
             .WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IResourceManagementPluginProvider>())
+            .WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IInputPluginProvider>())
             .InitialiseAndRegisterComponents();
 
     std::shared_ptr<NovelRT::Ecs::Graphics::DefaultRenderingSystem> renderingSystem =

diff --git a/src/NovelRT/Graphics/Vulkan/VulkanGraphicsDevice.cpp b/src/NovelRT/Graphics/Vulkan/VulkanGraphicsDevice.cpp
@@ -322,7 +322,7 @@ namespace NovelRT::Graphics::Vulkan
                                                              imagesKHRQuery);
         }
 
-        ResizeGraphicsContexts(imageCount); // TODO: This making vulkan angry for some reason.
+        ResizeGraphicsContexts(imageCount);
 
         std::vector<VkImage> swapChainImages = std::vector<VkImage>(imageCount);
         imagesKHRQuery = vkGetSwapchainImagesKHR(device, vulkanSwapchain, &imageCount, swapChainImages.data());