mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits

Browse Source
This commit is contained in:
twinaphex 2016-02-19 11:29:15 +01:00
parent a61536ffdc
commit c105fb22f3
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gfx/drivers_context/wayland_ctx.c
View File

@ -482,13 +482,13 @@ static bool vulkan_init_context(gfx_ctx_vulkan_data_t *vk)
{ {
unsigned i; unsigned i;
uint32_t queue_count; uint32_t queue_count;
VkInstanceCreateInfo info = { VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO };
VkDeviceQueueCreateInfo queue_info = { VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO };
VkDeviceCreateInfo device_info = { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO };
VkQueueFamilyProperties queue_properties[32]; VkQueueFamilyProperties queue_properties[32];
uint32_t gpu_count = 1; VkInstanceCreateInfo info = { VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO };
bool found_queue = false; VkDeviceQueueCreateInfo queue_info = { VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO };
static const float one = 1.0f; VkDeviceCreateInfo device_info = { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO };
uint32_t gpu_count = 1;
bool found_queue = false;
static const float one = 1.0f;
static const char *instance_extensions[] = { static const char *instance_extensions[] = {
"VK_KHR_surface", "VK_KHR_surface",
@ -498,23 +498,23 @@ static bool vulkan_init_context(gfx_ctx_vulkan_data_t *vk)
static const char *device_extensions[] = { static const char *device_extensions[] = {
"VK_KHR_swapchain", "VK_KHR_swapchain",
}; };
VkApplicationInfo app = { VK_STRUCTURE_TYPE_APPLICATION_INFO }; VkApplicationInfo app = { VK_STRUCTURE_TYPE_APPLICATION_INFO };
VkPhysicalDeviceFeatures features = { false }; VkPhysicalDeviceFeatures features = { false };
app.pApplicationName = "RetroArch"; app.pApplicationName = "RetroArch";
app.applicationVersion = 0; app.applicationVersion = 0;
app.pEngineName = "RetroArch"; app.pEngineName = "RetroArch";
app.engineVersion = 0; app.engineVersion = 0;
app.apiVersion = VK_API_VERSION; app.apiVersion = VK_API_VERSION;
info.pApplicationInfo = &app; info.pApplicationInfo = &app;
info.enabledExtensionCount = ARRAY_SIZE(instance_extensions); info.enabledExtensionCount = ARRAY_SIZE(instance_extensions);
info.ppEnabledExtensionNames = instance_extensions; info.ppEnabledExtensionNames = instance_extensions;
if (cached_instance) if (cached_instance)
{ {
vk->context.instance = cached_instance; vk->context.instance = cached_instance;
cached_instance = NULL; cached_instance = NULL;
} }
else if (vkCreateInstance(&info, NULL, &vk->context.instance) != VK_SUCCESS) else if (vkCreateInstance(&info, NULL, &vk->context.instance) != VK_SUCCESS)
return false; return false;
@ -529,12 +529,18 @@ static bool vulkan_init_context(gfx_ctx_vulkan_data_t *vk)
return false; return false;
} }
vkGetPhysicalDeviceProperties(vk->context.gpu, &vk->context.gpu_properties); vkGetPhysicalDeviceProperties(vk->context.gpu,
vkGetPhysicalDeviceMemoryProperties(vk->context.gpu, &vk->context.memory_properties); &vk->context.gpu_properties);
vkGetPhysicalDeviceQueueFamilyProperties(vk->context.gpu, &queue_count, NULL); vkGetPhysicalDeviceMemoryProperties(vk->context.gpu,
&vk->context.memory_properties);
vkGetPhysicalDeviceQueueFamilyProperties(vk->context.gpu,
&queue_count, NULL);
if (queue_count < 1 || queue_count > 32) if (queue_count < 1 || queue_count > 32)
return false; return false;
vkGetPhysicalDeviceQueueFamilyProperties(vk->context.gpu, &queue_count, queue_properties);
vkGetPhysicalDeviceQueueFamilyProperties(vk->context.gpu,
&queue_count, queue_properties);
for (i = 0; i < queue_count; i++) for (i = 0; i < queue_count; i++)
{ {