Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

rendervulkan: Use Vulkan 1.1

Browse source 
Less hastle going forward for stuff promoted, and we don't want to be running on stuff that doesn't support this anyway...
This commit is contained in:
Joshua Ashton 2021-05-15 20:09:48 +01:00 committed by Pierre-Loup A. Griffais
parent d176770c15
commit 39fff770f4
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/rendervulkan.cpp
View file

@ -24,7 +24,7 @@ const VkApplicationInfo appInfo = {
.applicationVersion = VK_MAKE_VERSION(1, 0, 0), .applicationVersion = VK_MAKE_VERSION(1, 0, 0),
.pEngineName = "just some code", .pEngineName = "just some code",
.engineVersion = VK_MAKE_VERSION(1, 0, 0), .engineVersion = VK_MAKE_VERSION(1, 0, 0),
.apiVersion = VK_API_VERSION_1_0, .apiVersion = VK_API_VERSION_1_1,
}; };
std::vector< const char * > g_vecSDLInstanceExts; std::vector< const char * > g_vecSDLInstanceExts;
@ -801,6 +801,14 @@ void init_formats()
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
} }
static bool is_vulkan_1_1_device(VkPhysicalDevice device)
{
VkPhysicalDeviceProperties properties;
vkGetPhysicalDeviceProperties(device, &properties);
return properties.apiVersion >= VK_API_VERSION_1_1;
}
int init_device() int init_device()
{ {
uint32_t physicalDeviceCount = 0; uint32_t physicalDeviceCount = 0;
@ -823,6 +831,9 @@ int init_device()
retry: retry:
for (uint32_t i = 0; i < physicalDeviceCount; ++i) for (uint32_t i = 0; i < physicalDeviceCount; ++i)
{ {
if (!is_vulkan_1_1_device(deviceHandles[i]))
continue;
uint32_t queueFamilyCount = 0; uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(deviceHandles[i], &queueFamilyCount, NULL); vkGetPhysicalDeviceQueueFamilyProperties(deviceHandles[i], &queueFamilyCount, NULL);
queueFamilyCount = queueFamilyCount > MAX_QUEUE_COUNT ? MAX_QUEUE_COUNT : queueFamilyCount; queueFamilyCount = queueFamilyCount > MAX_QUEUE_COUNT ? MAX_QUEUE_COUNT : queueFamilyCount;
@ -910,11 +921,9 @@ retry:
vecEnabledDeviceExtensions.push_back( VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME ); vecEnabledDeviceExtensions.push_back( VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME );
} }
vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME );
vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME ); vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME );
vecEnabledDeviceExtensions.push_back( VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME ); vecEnabledDeviceExtensions.push_back( VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME );
vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME );
vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME ); vecEnabledDeviceExtensions.push_back( VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME );
VkDeviceCreateInfo deviceCreateInfo = { VkDeviceCreateInfo deviceCreateInfo = {
@ -1510,10 +1519,6 @@ int vulkan_init(void)
VkResult result = VK_ERROR_INITIALIZATION_FAILED; VkResult result = VK_ERROR_INITIALIZATION_FAILED;
std::vector< const char * > vecEnabledInstanceExtensions; std::vector< const char * > vecEnabledInstanceExtensions;
vecEnabledInstanceExtensions.push_back( VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME );
vecEnabledInstanceExtensions.push_back( VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME );
vecEnabledInstanceExtensions.push_back( VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME );
vecEnabledInstanceExtensions.insert( vecEnabledInstanceExtensions.end(), g_vecSDLInstanceExts.begin(), g_vecSDLInstanceExts.end() ); vecEnabledInstanceExtensions.insert( vecEnabledInstanceExtensions.end(), g_vecSDLInstanceExts.begin(), g_vecSDLInstanceExts.end() );
const VkInstanceCreateInfo createInfo = { const VkInstanceCreateInfo createInfo = {