AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Phillip Stephens 2016-07-23 23:33:23 -07:00
parent d71c01e1d7
commit cf26e39259
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/win/ApplicationWin32.cpp
View File

@ -78,7 +78,9 @@ class ApplicationWin32 final : public IApplication
bool m_singleInstance; bool m_singleInstance;
Boo3DAppContext m_3dCtx; Boo3DAppContext m_3dCtx;
#if BOO_HAS_VULKAN
PFN_vkGetInstanceProcAddr m_getVkProc = nullptr; PFN_vkGetInstanceProcAddr m_getVkProc = nullptr;
#endif
void _deletedWindow(IWindow* window) void _deletedWindow(IWindow* window)
{ {
@ -423,7 +425,12 @@ public:
return m_mwret; return m_mwret;
} }
#if BOO_HAS_VULKAN
IWindow* window = _WindowWin32New(title, m_3dCtx, m_getVkProc, sampleCount); IWindow* window = _WindowWin32New(title, m_3dCtx, m_getVkProc, sampleCount);
#else
IWindow* window = _WindowWin32New(title, m_3dCtx, nullptr, sampleCount);
#endif
HWND hwnd = HWND(window->getPlatformHandle()); HWND hwnd = HWND(window->getPlatformHandle());
m_allWindows[hwnd] = window; m_allWindows[hwnd] = window;
return window; return window;

2
lib/win/WindowWin32.cpp
View File

@ -972,6 +972,7 @@ public:
this, m_hwnd, b3dCtx, sampleCount)); this, m_hwnd, b3dCtx, sampleCount));
return; return;
} }
#if BOO_HAS_VULKAN
else if (b3dCtx.m_vulkanDxFactory) else if (b3dCtx.m_vulkanDxFactory)
{ {
m_gfxCtx.reset(new GraphicsContextWin32Vulkan(this, wndInstance, m_hwnd, &g_VulkanContext, m_gfxCtx.reset(new GraphicsContextWin32Vulkan(this, wndInstance, m_hwnd, &g_VulkanContext,
@ -979,6 +980,7 @@ public:
if (m_gfxCtx->initializeContext(vulkanHandle)) if (m_gfxCtx->initializeContext(vulkanHandle))
return; return;
} }
#endif
m_gfxCtx.reset(new GraphicsContextWin32D3D(api, this, m_hwnd, b3dCtx, sampleCount)); m_gfxCtx.reset(new GraphicsContextWin32D3D(api, this, m_hwnd, b3dCtx, sampleCount));
} }