diff --git a/src/Win/WinWindow.h b/inc/hgl/platform/WinWindow.h similarity index 100% rename from src/Win/WinWindow.h rename to inc/hgl/platform/WinWindow.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35dbc04..1a4b535 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ -OPTION(VULKAN_SUPPORT "" OFF) - -SET(CPU_INFO_HEADER ${CMPLATFORM_ROOT_INCLUDE_PATH}/hgl/platform/CpuInfo.h) +SET(CPU_INFO_HEADER ${CMPLATFORM_ROOT_INCLUDE_PATH}/hgl/platform/CpuInfo.h) IF(UNIX) SET(PLATFORM_FILE_SOURCE UNIX/File.cpp @@ -105,11 +103,6 @@ IF(WIN32) Win/WinWindow.cpp Win/WinMessage.cpp Win/EnumWinFonts.cpp) - - IF(VULKAN_SUPPORT) - SET(PLATFORM_WINDOW_SOURCE ${PLATFORM_WINDOW_SOURCE} - Win/WinVulkan.cpp) - ENDIF() ENDIF(WIN32) SET(PLATFORM_WINDOW_SOURCE ${PLATFORM_WINDOW_SOURCE} Window.cpp ) diff --git a/src/Win/WinMessage.cpp b/src/Win/WinMessage.cpp index ae3a120..ce68eb3 100644 --- a/src/Win/WinMessage.cpp +++ b/src/Win/WinMessage.cpp @@ -1,4 +1,4 @@ -#include"WinWindow.h" +#include #include #include #include diff --git a/src/Win/WinVulkan.cpp b/src/Win/WinVulkan.cpp deleted file mode 100644 index c7c7edb..0000000 --- a/src/Win/WinVulkan.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include"WinWindow.h" -#include - -namespace hgl -{ - VkSurfaceKHR CreateVulkanSurface(VkInstance vk_inst,Window *w) - { - if(vk_inst==VK_NULL_HANDLE)return(VK_NULL_HANDLE); - if(!w)return(VK_NULL_HANDLE); - - WinWindow *win=(WinWindow *)w; - - VkWin32SurfaceCreateInfoKHR createInfo; - createInfo.sType =VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; - createInfo.pNext =nullptr; - createInfo.flags =0; - createInfo.hinstance=win->GetInstance(); - createInfo.hwnd =win->GetWnd(); - - VkSurfaceKHR surface; - - VkResult res=vkCreateWin32SurfaceKHR(vk_inst,&createInfo,nullptr,&surface); - - if(res!=VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl \ No newline at end of file diff --git a/src/Win/WinWindow.cpp b/src/Win/WinWindow.cpp index 4b67661..c0d9755 100644 --- a/src/Win/WinWindow.cpp +++ b/src/Win/WinWindow.cpp @@ -1,4 +1,4 @@ -#include"WinWindow.h" +#include namespace hgl {