redstrate/prism
Archived
1
Fork 0
Code Activity

Fix Vulkan queue creation on macOS

Browse source
This commit is contained in:
redstrate 2021-09-13 13:47:42 -04:00
parent 4680579899
commit f6df3d23b3
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/gfx/vulkan/include/gfx_vulkan.hpp
View file

@ -1,12 +1,5 @@
#pragma once #pragma once
#ifdef PLATFORM_WINDOWS
#define NOMINMAX // donut define max in windows.h
#define VK_USE_PLATFORM_WIN32_KHR
#else
#define VK_USE_PLATFORM_XCB_KHR
#endif
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include <map> #include <map>

48
engine/gfx/vulkan/src/gfx_vulkan.cpp
View file

@ -4,7 +4,6 @@
#include <limits> #include <limits>
#include <cstddef> #include <cstddef>
#include <array> #include <array>
#include <sstream>
#include "gfx_vulkan_buffer.hpp" #include "gfx_vulkan_buffer.hpp"
#include "gfx_vulkan_pipeline.hpp" #include "gfx_vulkan_pipeline.hpp"
@ -20,11 +19,6 @@
#include <platform.hpp> #include <platform.hpp>
#ifdef PLATFORM_LINUX
#include <SDL2/SDL.h>
#endif
VkFormat toVkFormat(GFXPixelFormat format) { VkFormat toVkFormat(GFXPixelFormat format) {
switch (format) { switch (format) {
case GFXPixelFormat::R_32F: case GFXPixelFormat::R_32F:
@ -1789,7 +1783,33 @@ void GFXVulkan::createLogicalDevice(std::vector<const char*> extensions) {
queueCreateInfo.pQueuePriorities = &queuePriority; queueCreateInfo.pQueuePriorities = &queuePriority;
queueCreateInfos.push_back(queueCreateInfo); queueCreateInfos.push_back(queueCreateInfo);
} } else {
// graphics
{
VkDeviceQueueCreateInfo queueCreateInfo = {};
queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfo.queueFamilyIndex = graphicsFamilyIndex;
queueCreateInfo.queueCount = 1;
float queuePriority = 1.0f;
queueCreateInfo.pQueuePriorities = &queuePriority;
queueCreateInfos.push_back(queueCreateInfo);
}
// present
{
VkDeviceQueueCreateInfo queueCreateInfo = {};
queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfo.queueFamilyIndex = presentFamilyIndex;
queueCreateInfo.queueCount = 1;
float queuePriority = 1.0f;
queueCreateInfo.pQueuePriorities = &queuePriority;
queueCreateInfos.push_back(queueCreateInfo);
}
}
VkDeviceCreateInfo createInfo = {}; VkDeviceCreateInfo createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
@ -1823,23 +1843,9 @@ void GFXVulkan::createLogicalDevice(std::vector<const char*> extensions) {
} }
void GFXVulkan::createSwapchain(NativeSurface* native_surface, VkSwapchainKHR oldSwapchain) { void GFXVulkan::createSwapchain(NativeSurface* native_surface, VkSwapchainKHR oldSwapchain) {
#ifdef PLATFORM_WINDOWS_OLD
// create win32 surface
if(native_surface->surface == VK_NULL_HANDLE)
{
VkWin32SurfaceCreateInfoKHR createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
createInfo.hwnd = (HWND)native_surface->windowNativeHandle;
createInfo.hinstance = GetModuleHandle(nullptr);
vkCreateWin32SurfaceKHR(instance, &createInfo, nullptr, &native_surface->surface);
}
#else
if(native_surface->surface == VK_NULL_HANDLE) { if(native_surface->surface == VK_NULL_HANDLE) {
native_surface->surface = (VkSurfaceKHR)platform::create_native_surface(native_surface->identifier, (void*)instance); native_surface->surface = (VkSurfaceKHR)platform::create_native_surface(native_surface->identifier, (void*)instance);
} }
#endif
// TODO: fix this pls // TODO: fix this pls
VkBool32 supported; VkBool32 supported;