Warwick/new-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added presentation support check

Browse source
This commit is contained in:
Warwick New 2024-12-16 15:48:25 +00:00
parent 25eb1f8e54
commit 4a40ed5d90
1 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/main.c
View file

@ -223,11 +223,18 @@ void DestroyDebugUtilsMessengerEXT(VkInstance instance,
struct QueueFamilyIndices_s { struct QueueFamilyIndices_s {
bool graphicsFamilyExists; bool graphicsFamilyExists;
uint32_t graphicsFamily; uint32_t graphicsFamily;
} QueueFamilyIndices_default = {.graphicsFamilyExists = false, bool presentFamilyExists;
.graphicsFamily = 0}; uint32_t presentFamily;
} QueueFamilyIndices_default = {
.graphicsFamilyExists = false,
.graphicsFamily = 0,
.presentFamilyExists = false,
.presentFamily = 0,
};
typedef struct QueueFamilyIndices_s QueueFamilyIndices; typedef struct QueueFamilyIndices_s QueueFamilyIndices;
QueueFamilyIndices findQueueFamilies(VkPhysicalDevice device) { QueueFamilyIndices findQueueFamilies(VkPhysicalDevice device,
VkSurfaceKHR *surface) {
QueueFamilyIndices indices = QueueFamilyIndices_default; QueueFamilyIndices indices = QueueFamilyIndices_default;
uint32_t queueFamilyCount = 0; uint32_t queueFamilyCount = 0;
@ -235,22 +242,34 @@ QueueFamilyIndices findQueueFamilies(VkPhysicalDevice device) {
VkQueueFamilyProperties queueFamilies[queueFamilyCount]; VkQueueFamilyProperties queueFamilies[queueFamilyCount];
vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount, vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyCount,
queueFamilies); queueFamilies);
uint32_t i;
for (uint32_t i = 0; i < queueFamilyCount; i++) { for (i = 0; i < queueFamilyCount; i++) {
// Graphics support
if (queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) { if (queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
indices.graphicsFamily = i; indices.graphicsFamily = i;
indices.graphicsFamilyExists = true; indices.graphicsFamilyExists = true;
break; // remove if we need additional checks in future }
// Surface support
VkBool32 presentSupport = false;
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, *surface, &presentSupport);
if (presentSupport) {
indices.presentFamilyExists = true;
indices.presentFamily = i;
}
// Early break if we've found everything
if (indices.presentFamilyExists && indices.graphicsFamilyExists) {
break;
} }
} }
return indices; return indices;
} }
bool isDeviceSuitable(VkPhysicalDevice device) { bool isDeviceSuitable(VkPhysicalDevice device, VkSurfaceKHR *surface) {
QueueFamilyIndices indices = findQueueFamilies(device); QueueFamilyIndices indices = findQueueFamilies(device, surface);
return indices.graphicsFamilyExists; return indices.graphicsFamilyExists && indices.graphicsFamilyExists;
} }
void pickPhysicalDevice(Application *app) { void pickPhysicalDevice(Application *app) {
@ -268,7 +287,7 @@ void pickPhysicalDevice(Application *app) {
// TODO: pick device off of more than if it's just suitable // TODO: pick device off of more than if it's just suitable
for (int i = 0; i < physicalDeviceCount; i++) { for (int i = 0; i < physicalDeviceCount; i++) {
if (isDeviceSuitable(physicalDevices[i])) { if (isDeviceSuitable(physicalDevices[i], &app->surface)) {
physicalDevice = physicalDevices[i]; physicalDevice = physicalDevices[i];
break; break;
} }
@ -284,7 +303,7 @@ void pickPhysicalDevice(Application *app) {
void createLogicalDevice(Application *app) { void createLogicalDevice(Application *app) {
// Specify Queues // Specify Queues
QueueFamilyIndices indeces = findQueueFamilies(app->physicalDevice); QueueFamilyIndices indeces = findQueueFamilies(app->physicalDevice, &app->surface);
VkDeviceQueueCreateInfo queueCreateInfo = {}; VkDeviceQueueCreateInfo queueCreateInfo = {};
queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queueCreateInfo.queueFamilyIndex = indeces.graphicsFamily; queueCreateInfo.queueFamilyIndex = indeces.graphicsFamily;
@ -320,13 +339,6 @@ void createLogicalDevice(Application *app) {
vkGetDeviceQueue(app->device, indeces.graphicsFamily, 0, &app->graphicsQueue); vkGetDeviceQueue(app->device, indeces.graphicsFamily, 0, &app->graphicsQueue);
} }
void initVulkan(Application *app) {
createInstance(app);
setupDebugMessenger(app);
pickPhysicalDevice(app);
createLogicalDevice(app);
}
void createSurface(Application *app) { void createSurface(Application *app) {
if (glfwCreateWindowSurface(app->instance, app->window, NULL, if (glfwCreateWindowSurface(app->instance, app->window, NULL,
&app->surface) != VK_SUCCESS) { &app->surface) != VK_SUCCESS) {
@ -335,6 +347,14 @@ void createSurface(Application *app) {
} }
} }
void initVulkan(Application *app) {
createInstance(app);
setupDebugMessenger(app);
createSurface(app);
pickPhysicalDevice(app);
createLogicalDevice(app);
}
void mainLoop(Application *app) { void mainLoop(Application *app) {
while (!glfwWindowShouldClose(app->window)) { while (!glfwWindowShouldClose(app->window)) {
glfwPollEvents(); glfwPollEvents();
@ -357,7 +377,6 @@ int main(void) {
initWindow(&app); initWindow(&app);
initVulkan(&app); initVulkan(&app);
createSurface(&app);
mainLoop(&app); mainLoop(&app);
cleanup(&app); cleanup(&app);