Skip to content

Accept Integrated GPUs #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chymyaa wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Accept Integrated GPUs #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22c1b8e
Simplify physical device selection logic
chymyaa Aug 23, 2026
87b9f4e
Accept integrated GPUs in physical device selection
chymyaa Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 5 additions & 40 deletions src/core/vulkan/physical_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#include "core/vulkan/physical_device.hpp"

#include "core/vulkan/instance.hpp"
#include "core/vulkan/window.hpp"

#include <cstdlib>
#include <iostream>
#include <string>
#include <vector>

std::ostream &physicalDeviceCout() {
return std::cout << "[PhysicalDevice] ";
}

std::ostream &physicalDeviceCerr() {
return std::cerr << "[PhysicalDevice] ";
}
Expand All @@ -20,37 +19,29 @@ bool isDeviceSuitable(VkPhysicalDevice device) {
vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr);
std::vector<VkExtensionProperties> availableExtensions(extensionCount);
vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, availableExtensions.data());

bool hasSwapchain = false;
bool hasRayTracing = false;

for (const auto &ext : availableExtensions) {
if (std::string(ext.extensionName) == VK_KHR_SWAPCHAIN_EXTENSION_NAME) { hasSwapchain = true; }
if (std::string(ext.extensionName) == VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME) { hasRayTracing = true; }
}

if (!hasSwapchain || !hasRayTracing) return false;

// check features
VkPhysicalDeviceVulkan12Features vulkan12Features{};
vulkan12Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES;

VkPhysicalDeviceVulkan13Features vulkan13Features{};
vulkan13Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES;
vulkan13Features.pNext = &vulkan12Features;

VkPhysicalDeviceAccelerationStructureFeaturesKHR accelerationStructureFeatures{};
accelerationStructureFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
accelerationStructureFeatures.pNext = &vulkan13Features;

VkPhysicalDeviceRayTracingPipelineFeaturesKHR rayTracingFeatures = {};
rayTracingFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
rayTracingFeatures.pNext = &accelerationStructureFeatures;

VkPhysicalDeviceFeatures2 features2 = {};
features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
features2.pNext = &rayTracingFeatures;

vkGetPhysicalDeviceFeatures2(device, &features2);
if (!rayTracingFeatures.rayTracingPipeline || !accelerationStructureFeatures.accelerationStructure ||
!vulkan13Features.synchronization2 || !vulkan12Features.bufferDeviceAddress) {
Expand All @@ -76,27 +67,20 @@ void vk::PhysicalDevice::findPhysicalDevice() {
// find the first supported physical device
for (const auto &device : devices) {
if (isDeviceSuitable(device)) {
physicalDevice_ = device;

VkPhysicalDeviceProperties properties;
vkGetPhysicalDeviceProperties(device, &properties);

if (properties.deviceType != VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) continue;

physicalDevice_ = device;
#ifdef DEBUG
physicalDeviceCout() << "found suitable physical device" << std::endl;
#endif

// output device info
uint32_t supportedVersion[] = {VK_VERSION_MAJOR(properties.apiVersion),
VK_VERSION_MINOR(properties.apiVersion),
VK_VERSION_PATCH(properties.apiVersion)};

#ifdef DEBUG
physicalDeviceCout() << "selected device name: " << properties.deviceName << std::endl;
physicalDeviceCout() << "supports Vulkan version: " << supportedVersion[0] << "." << supportedVersion[1]
<< "." << supportedVersion[2] << std::endl;
#endif

return;
}
}
Expand All @@ -110,19 +94,15 @@ vk::PhysicalDevice::PhysicalDevice(std::shared_ptr<Instance> instance, std::shar
: instance_(instance), window_(window) {
findPhysicalDevice();
findQueueFamilies();

VkPhysicalDeviceAccelerationStructurePropertiesKHR accelStructProperties{};
accelStructProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR;

VkPhysicalDeviceRayTracingPipelinePropertiesKHR rayTracingProperties{};
rayTracingProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR;
rayTracingProperties.pNext = &accelStructProperties;

VkPhysicalDeviceProperties2 deviceProps2{};
deviceProps2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
deviceProps2.pNext = &rayTracingProperties;
vkGetPhysicalDeviceProperties2(physicalDevice_, &deviceProps2);

properties_ = deviceProps2.properties;
rayTracingProperties_ = rayTracingProperties;
accelerationStructProperties_ = accelStructProperties;
Expand All @@ -149,38 +129,30 @@ uint32_t vk::PhysicalDevice::secondaryQueueIndex() {
void vk::PhysicalDevice::findQueueFamilies() {
uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice_, &queueFamilyCount, nullptr);

if (queueFamilyCount == 0) {
physicalDeviceCerr() << "Physical device has no queue families!" << std::endl;
exit(EXIT_FAILURE);
}

std::vector<VkQueueFamilyProperties> queueFamilies(queueFamilyCount);
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice_, &queueFamilyCount, queueFamilies.data());

#ifdef DEBUG
physicalDeviceCout() << "physical device has " << queueFamilyCount << " queue families" << std::endl;
#endif

for (uint32_t i = 0; i < queueFamilyCount; i++) {
VkBool32 presentSupport = false;
vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice_, i, window_->vkSurface(), &presentSupport);

VkBool32 graphicsSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)) {
graphicsSupport = true;
}

VkBool32 computeSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_COMPUTE_BIT)) {
computeSupport = true;
}

VkBool32 transferSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_TRANSFER_BIT)) {
transferSupport = true;
}

// Early exit if all needed queue families are found
if (presentSupport && graphicsSupport && computeSupport && transferSupport) {
mainQueueIndex_ = i;
Expand All @@ -189,38 +161,31 @@ void vk::PhysicalDevice::findQueueFamilies() {
break;
}
}

for (uint32_t i = 0; i < queueFamilyCount; i++) {
VkBool32 presentSupport = false;
vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice_, i, window_->vkSurface(), &presentSupport);

VkBool32 graphicsSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)) {
graphicsSupport = true;
}

VkBool32 computeSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_COMPUTE_BIT)) {
computeSupport = true;
}

VkBool32 transferSupport = false;
if (queueFamilies[i].queueCount > 0 && (queueFamilies[i].queueFlags & VK_QUEUE_TRANSFER_BIT)) {
transferSupport = true;
}

// Early exit if all needed queue families are found
if (computeSupport && transferSupport && i != mainQueueIndex_) {
secondaryQueueIndex_ = i;
break;
}
}

if (mainQueueIndex_ == -1) {
physicalDeviceCerr() << "No queue family that supports graphics, compute and transfer found." << std::endl;
exit(EXIT_FAILURE);
}

if (secondaryQueueIndex_ == -1) {
physicalDeviceCerr() << "No queue family that supports graphics, compute and transfer found." << std::endl;
exit(EXIT_FAILURE);
Expand All @@ -237,4 +202,4 @@ VkPhysicalDeviceRayTracingPipelinePropertiesKHR vk::PhysicalDevice::rayTracingPr

VkPhysicalDeviceAccelerationStructurePropertiesKHR vk::PhysicalDevice::accelerationStructProperties() {
return accelerationStructProperties_;
}
}