Skip to content

Commit 609e507

Browse files
authored
Merge pull request #403 from novelrt/bugfix/input-nullptr-fix
Input nullptr fix.
2 parents 267af65 + 0fe3624 commit 609e507

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

include/NovelRT/Graphics/Vulkan/VulkanGraphicsPluginProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace NovelRT::Graphics::Vulkan
88
{
99
class VulkanGraphicsPluginProvider final : public PluginManagement::IGraphicsPluginProvider
1010
{
11-
private:
11+
protected:
1212
NovelRT::Utilities::Lazy<std::shared_ptr<VulkanGraphicsProvider>> _graphicsProvider;
1313

1414
[[nodiscard]] std::shared_ptr<VulkanGraphicsProvider> CreateVulkanGraphicsProviderInternal();

include/NovelRT/Input/Glfw/GlfwInputPluginProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NovelRT::Input::Glfw
1212
{
1313
class GlfwInputPluginProvider final : public PluginManagement::IInputPluginProvider
1414
{
15-
private:
15+
protected:
1616
std::shared_ptr<GlfwInputDevice> _inputDevice;
1717

1818
[[nodiscard]] GlfwInputDevice* GetInputDeviceInternal() override;

include/NovelRT/PluginManagement/IGraphicsPluginProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NovelRT::PluginManagement
1212
{
1313
class IGraphicsPluginProvider
1414
{
15-
private:
15+
protected:
1616
[[nodiscard]] virtual Graphics::GraphicsProvider* GetGraphicsProviderInternal() = 0;
1717

1818
public:

include/NovelRT/PluginManagement/IInputPluginProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NovelRT::PluginManagement
1212
{
1313
class IInputPluginProvider
1414
{
15-
private:
15+
protected:
1616
[[nodiscard]] virtual NovelRT::Input::IInputDevice* GetInputDeviceInternal() = 0;
1717

1818
public:

samples/EcsPipeline/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ int main()
1919
.WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IGraphicsPluginProvider>())
2020
.WithPluginProvider(windowingProvider)
2121
.WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IResourceManagementPluginProvider>())
22+
.WithPluginProvider(selector.GetDefaultPluginTypeOnCurrentPlatformFor<IInputPluginProvider>())
2223
.InitialiseAndRegisterComponents();
2324

2425
std::shared_ptr<NovelRT::Ecs::Graphics::DefaultRenderingSystem> renderingSystem =

src/NovelRT/Graphics/Vulkan/VulkanGraphicsDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ namespace NovelRT::Graphics::Vulkan
322322
imagesKHRQuery);
323323
}
324324

325-
ResizeGraphicsContexts(imageCount); // TODO: This making vulkan angry for some reason.
325+
ResizeGraphicsContexts(imageCount);
326326

327327
std::vector<VkImage> swapChainImages = std::vector<VkImage>(imageCount);
328328
imagesKHRQuery = vkGetSwapchainImagesKHR(device, vulkanSwapchain, &imageCount, swapChainImages.data());

0 commit comments

Comments
 (0)