From 618fda25036a1949de990d0588e87f838f15e6c8 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 28 Jul 2023 20:12:40 +0800 Subject: [PATCH] removed vulkan surface. --- src/Android/AndroidVulkan.cpp | 29 ----------------------------- src/Apple/MacVulkan.cpp | 29 ----------------------------- src/Apple/iOSVulkan.cpp | 29 ----------------------------- src/CMakeLists.txt | 7 +------ src/UNIX/WaylandVulkan.cpp | 30 ------------------------------ src/UNIX/XCBVulkan.cpp | 30 ------------------------------ 6 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 src/Android/AndroidVulkan.cpp delete mode 100644 src/Apple/MacVulkan.cpp delete mode 100644 src/Apple/iOSVulkan.cpp delete mode 100644 src/UNIX/WaylandVulkan.cpp delete mode 100644 src/UNIX/XCBVulkan.cpp diff --git a/src/Android/AndroidVulkan.cpp b/src/Android/AndroidVulkan.cpp deleted file mode 100644 index cb34159..0000000 --- a/src/Android/AndroidVulkan.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include"AndroidWindow.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); - - AndroidWindow *win=(Android *)w; - - VkAndroidSurfaceCreateInfoKHR createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; - createInfo.pNext = nullptr; - createInfo.flags = 0; - createInfo.window = win->GetWindow(); - - VkSurfaceKHR surface; - - VkResult res=CreateAndroidSurfaceKHR(vk_inst,&createInfo,nullptr,&surface); - - if(res!=VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl diff --git a/src/Apple/MacVulkan.cpp b/src/Apple/MacVulkan.cpp deleted file mode 100644 index 3a4510d..0000000 --- a/src/Apple/MacVulkan.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include"MacWindow.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); - - MacWindow *win=(MacWindow *)w; - - VkMacOSSurfaceCreateInfoMVK createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; - createInfo.pNext = nullptr; - createInfo.flags = 0; - createInfo.pView = win->GetView(); - - VkSurfaceKHR surface; - - VkResult res = vkCreateMacOSSurfaceMVK(vk_inst, &createInfo, nullptr, &surface); - - if (res != VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl diff --git a/src/Apple/iOSVulkan.cpp b/src/Apple/iOSVulkan.cpp deleted file mode 100644 index ddd68bb..0000000 --- a/src/Apple/iOSVulkan.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include"iOSWindow.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); - - iOSWindow *win=(iOSWindow *)w; - - VkIOSSurfaceCreateInfoMVK createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK; - createInfo.pNext = nullptr; - createInfo.flags = 0; - createInfo.pView = win->GetView(); - - VkSurfaceKHR surface; - - VkResult res = vkCreateIOSSurfaceMVK(vk_inst, &createInfo, nullptr, &surface); - - if (res != VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 466a204..ebd8658 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,10 +25,6 @@ IF(UNIX) SET(PLATFORM_MULTI_THREAD_SOURCE ${PLATFORM_MULTI_THREAD_SOURCE} UNIX/Semaphore.cpp) - - - SET(PLATFORM_WINDOW_SOURCE Android/AndroidVulkan.cpp) - ELSE() SET(PLATFORM_CODEPAGE_SOURCE UNIX/CodePage.cpp) SET(PLATFORM_LOG_SOURCE UNIX/LogConsole.cpp) @@ -46,8 +42,7 @@ IF(UNIX) SET(PLATFORM_FILE_SOURCE ${PLATFORM_FILE_SOURCE} UNIX/ProgramPath.cpp) - SET(PLATFORM_WINDOW_SOURCE UNIX/XCBWindow.cpp - UNIX/XCBVulkan.cpp) + SET(PLATFORM_WINDOW_SOURCE UNIX/XCBWindow.cpp) ENDIF() ENDIF() diff --git a/src/UNIX/WaylandVulkan.cpp b/src/UNIX/WaylandVulkan.cpp deleted file mode 100644 index bda8d59..0000000 --- a/src/UNIX/WaylandVulkan.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include"WaylandWindow.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); - - WaylandWindow *win=(WaylandWindow *)w; - - VkWaylandSurfaceCreateInfoKHR createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; - createInfo.pNext = nullptr; - createInfo.flags = 0; - createInfo.display = win->GetDisplay(); - createInfo.surface = win->GetSurface(); - - VkSurfaceKHR surface; - - VkResult res = vkCreateWaylandSurfaceKHR(vk_inst, &createInfo, nullptr, &surface); - - if (res != VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl diff --git a/src/UNIX/XCBVulkan.cpp b/src/UNIX/XCBVulkan.cpp deleted file mode 100644 index fe8913a..0000000 --- a/src/UNIX/XCBVulkan.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include"XCBWindow.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); - - XCBWindow *win=(XCBWindow *)w; - - VkXcbSurfaceCreateInfoKHR createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR; - createInfo.pNext = nullptr; - createInfo.flags = 0; - createInfo.connection = win->GetConnection(); - createInfo.window = win->GetWindow(); - - VkSurfaceKHR surface; - - VkResult res = vkCreateXcbSurfaceKHR(vk_inst, &createInfo, nullptr, &surface); - - if (res != VK_SUCCESS) - return(VK_NULL_HANDLE); - - return(surface); - } -}//namespace hgl