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

Shy attempt to make Vulkan work on macOS

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-12-11 20:58:14 -06:00 committed by David
parent 3f9be0ffae
commit f51a74a861
4 changed files with 74 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/std/os.c
View File

@ -1281,6 +1281,12 @@ void run_command(Arena* arena, CStringSlice arguments, char* envp[])
print("terminated unexpectedly with status {u32}\n", status); print("terminated unexpectedly with status {u32}\n", status);
} }
} }
else if (result == -1)
{
auto waitpid_error = errno;
print("Error waiting for process termination: {u32}\n", waitpid_error);
trap();
}
else else
{ {
todo(); todo();

103
bootstrap/std/render.c
View File

@ -987,13 +987,25 @@ Renderer* renderer_initialize(Arena* arena)
const char* extensions[] = const char* extensions[] =
{ {
VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_EXTENSION_NAME,
#ifdef __APPLE__
"VK_KHR_portability_subset",
VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME,
#endif
}; };
#ifdef __APPLE__
VkPhysicalDeviceDynamicRenderingFeatures dynamic_rendering_features = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES,
.pNext = 0,
.dynamicRendering = VK_TRUE,
};
#else
VkPhysicalDeviceVulkan13Features features13 = { VkPhysicalDeviceVulkan13Features features13 = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES,
.dynamicRendering = 1, .dynamicRendering = 1,
.synchronization2 = 1, .synchronization2 = 1,
}; };
#endif
VkPhysicalDeviceVulkan12Features features12 = { VkPhysicalDeviceVulkan12Features features12 = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
@ -1001,7 +1013,11 @@ Renderer* renderer_initialize(Arena* arena)
.descriptorIndexing = 1, .descriptorIndexing = 1,
.runtimeDescriptorArray = 1, .runtimeDescriptorArray = 1,
.shaderSampledImageArrayNonUniformIndexing = 1, .shaderSampledImageArrayNonUniformIndexing = 1,
#ifdef __APPLE__
.pNext = &dynamic_rendering_features,
#else
.pNext = &features13, .pNext = &features13,
#endif
}; };
VkPhysicalDeviceFeatures2 features = { VkPhysicalDeviceFeatures2 features = {
@ -1408,8 +1424,11 @@ fn void destroy_image(Renderer* renderer, VulkanImage image)
vkFreeMemory(renderer->device, image.memory.handle, renderer->allocator); vkFreeMemory(renderer->device, image.memory.handle, renderer->allocator);
} }
fn void swapchain_recreate(Renderer* renderer, RenderWindow* window, VkSurfaceCapabilitiesKHR surface_capabilities) fn void swapchain_recreate(Renderer* renderer, RenderWindow* window)
{ {
VkSurfaceCapabilitiesKHR surface_capabilities;
vkok(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(renderer->physical_device, window->surface, &surface_capabilities));
VkSwapchainKHR old_swapchain = window->swapchain; VkSwapchainKHR old_swapchain = window->swapchain;
VkImageView old_swapchain_image_views[MAX_SWAPCHAIN_IMAGE_COUNT]; VkImageView old_swapchain_image_views[MAX_SWAPCHAIN_IMAGE_COUNT];
@ -1539,42 +1558,52 @@ fn void swapchain_recreate(Renderer* renderer, RenderWindow* window, VkSurfaceCa
}); });
} }
typedef void GLFWwindow;
extern VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface);
RenderWindow* renderer_window_initialize(Renderer* renderer, OSWindow window) 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));
#ifdef VK_USE_PLATFORM_WIN32_KHR // {
VkWin32SurfaceCreateInfoKHR create_info = { // #ifdef VK_USE_PLATFORM_WIN32_KHR
.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR, // VkWin32SurfaceCreateInfoKHR create_info = {
.pNext = 0, // .sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
.flags = 0, // .pNext = 0,
.hinstance = os_windows_get_module_handle(), // .flags = 0,
.hwnd = win32_window_get(window), // .hinstance = os_windows_get_module_handle(),
}; // .hwnd = win32_window_get(window),
vkok(vkCreateWin32SurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface)); // };
#endif // vkok(vkCreateWin32SurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface));
#ifdef VK_USE_PLATFORM_XLIB_KHR // #endif
VkXlibSurfaceCreateInfoKHR create_info = { //
.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, // #ifdef VK_USE_PLATFORM_XLIB_KHR
.pNext = 0, // VkXlibSurfaceCreateInfoKHR create_info = {
.flags = 0, // .sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR,
.dpy = x11_display_get(), // .pNext = 0,
.window = x11_window_get(window), // .flags = 0,
}; // .dpy = x11_display_get(),
vkok(vkCreateXlibSurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface)); // .window = x11_window_get(window),
#endif // };
#ifdef VK_USE_PLATFORM_WAYLAND_KHR // vkok(vkCreateXlibSurfaceKHR(renderer->instance, &create_info, renderer->allocator, &result->surface));
VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, // #endif
#endif //
#ifdef VK_USE_PLATFORM_MACOS_MVK // #ifdef VK_USE_PLATFORM_WAYLAND_KHR
VK_KHR_COCOA_SURFACE_EXTENSION_NAME, // VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
#endif // #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
// }
VkSurfaceCapabilitiesKHR surface_capabilities; swapchain_recreate(renderer, result);
vkok(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(renderer->physical_device, result->surface, &surface_capabilities));
swapchain_recreate(renderer, result, surface_capabilities);
for (u64 frame_index = 0; frame_index < MAX_FRAME_COUNT; frame_index += 1) for (u64 frame_index = 0; frame_index < MAX_FRAME_COUNT; frame_index += 1)
{ {
@ -1703,9 +1732,7 @@ void renderer_window_frame_begin(Renderer* renderer, RenderWindow* window)
VkResult next_image_result = vkAcquireNextImageKHR(renderer->device, window->swapchain, timeout, frame->swapchain_semaphore, image_fence, &window->swapchain_image_index); VkResult next_image_result = vkAcquireNextImageKHR(renderer->device, window->swapchain, timeout, frame->swapchain_semaphore, image_fence, &window->swapchain_image_index);
if (next_image_result == VK_ERROR_OUT_OF_DATE_KHR) if (next_image_result == VK_ERROR_OUT_OF_DATE_KHR)
{ {
VkSurfaceCapabilitiesKHR surface_capabilities; swapchain_recreate(renderer, window);
vkok(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(renderer->physical_device, window->surface, &surface_capabilities));
swapchain_recreate(renderer, window, surface_capabilities);
} }
else if (next_image_result != VK_SUCCESS && next_image_result != VK_SUBOPTIMAL_KHR) else if (next_image_result != VK_SUCCESS && next_image_result != VK_SUBOPTIMAL_KHR)
{ {
@ -2022,9 +2049,7 @@ void renderer_window_frame_end(Renderer* renderer, RenderWindow* window)
} }
else if (present_result == VK_ERROR_OUT_OF_DATE_KHR || present_result == VK_SUBOPTIMAL_KHR) else if (present_result == VK_ERROR_OUT_OF_DATE_KHR || present_result == VK_SUBOPTIMAL_KHR)
{ {
VkSurfaceCapabilitiesKHR surface_capabilities; swapchain_recreate(renderer, window);
vkok(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(renderer->physical_device, window->surface, &surface_capabilities));
swapchain_recreate(renderer, window, surface_capabilities);
} }
else else
{ {

3
bootstrap/std/shader_compilation.c
View File

@ -89,6 +89,7 @@ fn SpirVBinary compileShaderToSPIRV_Vulkan(Arena* arena, glslang_stage_t stage,
String compile_shader(Arena* arena, String path, ShaderStage shader_stage) String compile_shader(Arena* arena, String path, ShaderStage shader_stage)
{ {
print("Compile shader\n");
#if SHADER_COMPILATION_USE_SOURCE #if SHADER_COMPILATION_USE_SOURCE
auto file = file_read(arena, path); auto file = file_read(arena, path);
@ -118,6 +119,8 @@ String compile_shader(Arena* arena, String path, ShaderStage shader_stage)
char* arguments[] = { char* arguments[] = {
#if _WIN32 #if _WIN32
"C:/VulkanSDK/1.3.296.0/Bin/glslangValidator.exe", "C:/VulkanSDK/1.3.296.0/Bin/glslangValidator.exe",
#elif defined (__APPLE__)
"/opt/homebrew/bin/glslangValidator",
#else #else
"/usr/bin/glslangValidator", "/usr/bin/glslangValidator",
#endif #endif

20
bootstrap/std/window.c
View File

@ -1,5 +1,6 @@
#include <std/window.h> #include <std/window.h>
#include <volk.h>
#define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <GLFW/glfw3native.h> #include <GLFW/glfw3native.h>
@ -395,22 +396,3 @@ OSCursorPosition os_window_cursor_position_get(OSWindow window)
glfwGetCursorPos(window, &result.x, &result.y); glfwGetCursorPos(window, &result.x, &result.y);
return result; return result;
} }
#ifdef _WIN32
HANDLE win32_window_get(OSWindow window)
{
return glfwGetWin32Window(window);
}
#endif
#ifdef __linux__
Display* x11_display_get()
{
return glfwGetX11Display();
}
Window x11_window_get(OSWindow window)
{
return glfwGetX11Window(window);
}
#endif