birth-software/bloat-buster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix small Vulkan X11 extensions issue

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-12-20 05:48:54 -06:00 committed by David
parent 665cc74bd1
commit b9a6e07448
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -211,7 +211,7 @@ if (NOT BB_IS_CI)
set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_WIN32_KHR) set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_WIN32_KHR)
target_compile_definitions(${COMPILER_NAME} PRIVATE GLFW_EXPOSE_NATIVE_WIN32) target_compile_definitions(${COMPILER_NAME} PRIVATE GLFW_EXPOSE_NATIVE_WIN32)
elseif(CMAKE_SYSTEM_NAME STREQUAL Linux) elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_XLIB_KHR) set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_XCB_KHR)
target_compile_definitions(${COMPILER_NAME} PRIVATE GLFW_EXPOSE_NATIVE_X11) target_compile_definitions(${COMPILER_NAME} PRIVATE GLFW_EXPOSE_NATIVE_X11)
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_METAL_EXT) set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_METAL_EXT)

40
bootstrap/std/render.c
View File

@ -919,6 +919,9 @@ Renderer* renderer_initialize(Arena* arena)
#endif #endif
#ifdef VK_USE_PLATFORM_XLIB_KHR #ifdef VK_USE_PLATFORM_XLIB_KHR
VK_KHR_XLIB_SURFACE_EXTENSION_NAME, VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
#endif
#ifdef VK_USE_PLATFORM_XCB_KHR
VK_KHR_XCB_SURFACE_EXTENSION_NAME,
#endif #endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR
VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
@ -1654,43 +1657,6 @@ RenderWindow* renderer_window_initialize(Renderer* renderer, OSWindow window)
{ {
RenderWindow* result = &renderer_window_memory; RenderWindow* result = &renderer_window_memory;
vkok(glfwCreateWindowSurface(renderer->instance, window, renderer->allocator, &result->surface)); vkok(glfwCreateWindowSurface(renderer->instance, window, renderer->allocator, &result->surface));
// {
// #ifdef VK_USE_PLATFORM_WIN32_KHR
// VkWin32SurfaceCreateInfoKHR create_info = {
// .sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
// .pNext = 0,
// .flags = 0,
// .hinstance = os_windows_get_module_handle(),
// .hwnd = win32_window_get(window),
// };
// vkok(vkCreateWin32SurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface));
// #endif
//
// #ifdef VK_USE_PLATFORM_XLIB_KHR
// VkXlibSurfaceCreateInfoKHR create_info = {
// .sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
// .pNext = 0,
// .flags = 0,
// .dpy = x11_display_get(),
// .window = x11_window_get(window),
// };
// vkok(vkCreateXlibSurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface));
// #endif
//
// #ifdef VK_USE_PLATFORM_WAYLAND_KHR
// VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
// #endif
//
// #ifdef VK_USE_PLATFORM_METAL_EXT
// VkMetalSurfaceCreateInfoEXT create_info = {
// .sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT,
// .pNext = 0,
// .flags = 0,
// };
//
// vkok(vkCreateMetalSurfaceEXT(renderer->instance, &create_info, renderer->allocator, &result->surface));
// #endif
// }
swapchain_recreate(renderer, result); swapchain_recreate(renderer, result);