Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Disable gdk_surface_create_vulkan_context()

Browse Source 
... and deprecate it.

It will now always return NULL and error out.

We do not want to expose any Vulkan internals in the public API.
This commit is contained in:
Benjamin Otte
2024-01-07 14:06:00 +01:00
parent 3ac50b81f2
commit 543c7ae52a
2 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gdk/gdksurface.c
View File

@@ -1246,43 +1246,20 @@ gdk_surface_create_cairo_context (GdkSurface *surface)
* @surface: a `GdkSurface`
* @error: return location for an error
*
* Creates a new `GdkVulkanContext` for rendering on @surface.
* Sets an error and returns %NULL.
*
* If the creation of the `GdkVulkanContext` failed, @error will be set.
* Returns: (transfer full): %NULL
*
* Returns: (transfer full): the newly created `GdkVulkanContext`, or
* %NULL on error
* Deprecated: 4.14: GTK does not expose any Vulkan internals. This
* function is a leftover that was accidentally exposed.
*/
GdkVulkanContext *
gdk_surface_create_vulkan_context (GdkSurface *surface,
GError **error)
{
GdkDisplay *display;
g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (gdk_display_get_debug_flags (surface->display) & GDK_DEBUG_VULKAN_DISABLE)
{
g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
_("Vulkan support disabled via GDK_DEBUG"));
return NULL;
}
display = surface->display;
if (GDK_DISPLAY_GET_CLASS (display)->vk_extension_name == NULL)
{
g_set_error (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_UNSUPPORTED,
"The %s backend has no Vulkan support.", G_OBJECT_TYPE_NAME (display));
return FALSE;
}
return g_initable_new (GDK_DISPLAY_GET_CLASS (display)->vk_context_type,
NULL,
error,
"surface", surface,
NULL);
g_set_error (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_UNSUPPORTED,
"GTK does not expose Vulkan internals.");
return FALSE;
}
static gboolean

2
gdk/gdksurface.h
View File

@@ -134,7 +134,7 @@ GdkCairoContext *gdk_surface_create_cairo_context(GdkSurface *surface);
GDK_AVAILABLE_IN_ALL
GdkGLContext * gdk_surface_create_gl_context (GdkSurface *surface,
GError **error);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_14
GdkVulkanContext *
gdk_surface_create_vulkan_context(GdkSurface *surface,
GError **error);