mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

vkinstance: add the necessary winsys extension

Browse source
This commit is contained in:
Matthew Waters 2015-12-31 15:38:37 +11:00
parent 3ed50f36ed
commit d067ed8a9e
2 changed files with 49 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
ext/vulkan/vkinstance.c
View file

@ -148,7 +148,6 @@ gst_vulkan_instance_open (GstVulkanInstance * instance, GError ** error)
uint32_t instance_layer_count = 0; uint32_t instance_layer_count = 0;
uint32_t enabled_layer_count = 0; uint32_t enabled_layer_count = 0;
gboolean validation_found; gboolean validation_found;
gboolean have_swapchain_ext = FALSE;
VkResult err; VkResult err;
GST_OBJECT_LOCK (instance); GST_OBJECT_LOCK (instance);
@ -207,28 +206,56 @@ gst_vulkan_instance_open (GstVulkanInstance * instance, GError ** error)
goto error; goto error;
} }
/* TODO: allow outside selection */ {
for (uint32_t i = 0; i < instance_extension_count; i++) { GstVulkanDisplayType display_type;
if (!g_strcmp0 (VK_KHR_SURFACE_EXTENSION_NAME, gboolean swapchain_ext_found = FALSE;
instance_extensions[i].extensionName)) { gboolean winsys_ext_found = FALSE;
have_swapchain_ext = TRUE; const gchar *winsys_ext_name;
extension_names[enabled_extension_count++] =
(gchar *) VK_KHR_SURFACE_EXTENSION_NAME; display_type = gst_vulkan_display_choose_type (instance);
winsys_ext_name =
gst_vulkan_display_type_to_extension_string (display_type);
if (!winsys_ext_name) {
GST_WARNING_OBJECT (instance, "No window system extension enabled");
winsys_ext_found = TRUE; /* Don't error out completely */
} }
if (!g_strcmp0 (VK_DEBUG_REPORT_EXTENSION_NAME,
instance_extensions[i].extensionName)) { /* TODO: allow outside selection */
extension_names[enabled_extension_count++] = for (uint32_t i = 0; i < instance_extension_count; i++) {
(gchar *) VK_DEBUG_REPORT_EXTENSION_NAME; if (!g_strcmp0 (VK_KHR_SURFACE_EXTENSION_NAME,
instance_extensions[i].extensionName)) {
swapchain_ext_found = TRUE;
extension_names[enabled_extension_count++] =
(gchar *) VK_KHR_SURFACE_EXTENSION_NAME;
}
if (!g_strcmp0 (VK_DEBUG_REPORT_EXTENSION_NAME,
instance_extensions[i].extensionName)) {
extension_names[enabled_extension_count++] =
(gchar *) VK_DEBUG_REPORT_EXTENSION_NAME;
}
if (!g_strcmp0 (winsys_ext_name, instance_extensions[i].extensionName)) {
winsys_ext_found = TRUE;
extension_names[enabled_extension_count++] = (gchar *) winsys_ext_name;
}
g_assert (enabled_extension_count < 64);
}
if (!swapchain_ext_found) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"vkEnumerateInstanceExtensionProperties failed to find the required "
"\"" VK_KHR_SURFACE_EXTENSION_NAME "\" extension");
g_free (instance_layers);
g_free (instance_extensions);
goto error;
}
if (!winsys_ext_found) {
g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
"vkEnumerateInstanceExtensionProperties failed to find the required "
"\"%s\" window system extension", winsys_ext_name);
g_free (instance_layers);
g_free (instance_extensions);
goto error;
} }
g_assert (enabled_extension_count < 64);
}
if (!have_swapchain_ext) {
g_error ("vkEnumerateInstanceExtensionProperties failed to find the \""
VK_KHR_SURFACE_EXTENSION_NAME
"\" extension.\n\nDo you have a compatible "
"Vulkan installable client driver (ICD) installed?\nPlease "
"look at the Getting Started guide for additional "
"information.\nvkCreateInstance Failure");
} }
{ {

2
ext/vulkan/vkinstance.h
View file

@ -21,7 +21,7 @@
#ifndef _VK_INSTANCE_H_ #ifndef _VK_INSTANCE_H_
#define _VK_INSTANCE_H_ #define _VK_INSTANCE_H_
#include "vk.h" #include <vk.h>
G_BEGIN_DECLS G_BEGIN_DECLS