We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Revised patch accounting for feedback

vk_extension-ver2.patch (text/plain), 4.06 KB, created by Jeremy Ong on 2018-08-24 04:15:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Ong

Created: 2018-08-24 04:15:21 UTC

Size: 4.06 KB

patch

obsolete

># HG changeset patch
># User jeremyong
># Date 1535083981 25200
>#      Thu Aug 23 21:13:01 2018 -0700
># Node ID a3ab95ff02ba4c229dd0a08e5deb779fa0272256
># Parent  f958f3c2e006ef1b9cac4f50ee97aa766e68894d
>Relax SDL_window check on SDL_Vulkan_GetInstanceExtensions to allow NULL
>
>diff -r f958f3c2e006 -r a3ab95ff02ba include/SDL_vulkan.h
>--- a/include/SDL_vulkan.h	Thu Aug 23 14:05:25 2018 -0700
>+++ b/include/SDL_vulkan.h	Thu Aug 23 21:13:01 2018 -0700
>@@ -135,7 +135,7 @@
>  *  \brief Get the names of the Vulkan instance extensions needed to create
>  *         a surface with \c SDL_Vulkan_CreateSurface().
>  *
>- *  \param [in]     window Window for which the required Vulkan instance
>+ *  \param [in]     \c NULL or window Window for which the required Vulkan instance
>  *                  extensions should be retrieved
>  *  \param [in,out] count pointer to an \c unsigned related to the number of
>  *                  required Vulkan instance extensions
>@@ -153,6 +153,10 @@
>  *  is smaller than the number of required extensions, \c SDL_FALSE will be
>  *  returned instead of \c SDL_TRUE, to indicate that not all the required
>  *  extensions were returned.
>+ * 
>+ *  \note If \c window is not NULL, it will be checked against its creation
>+ *        flags to ensure that the Vulkan flag is present. This parameter
>+ *        will be removed in a future major release.
>  *
>  *  \note The returned list of extensions will contain \c VK_KHR_surface
>  *        and zero or more platform specific extensions
>@@ -160,12 +164,13 @@
>  *  \note The extension names queried here must be enabled when calling
>  *        VkCreateInstance, otherwise surface creation will fail.
>  *
>- *  \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag.
>+ *  \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag
>+ *        or be \c NULL
>  *
>  *  \code
>  *  unsigned int count;
>  *  // get count of required extensions
>- *  if(!SDL_Vulkan_GetInstanceExtensions(window, &count, NULL))
>+ *  if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL))
>  *      handle_error();
>  *
>  *  static const char *const additionalExtensions[] =
>@@ -179,7 +184,7 @@
>  *      handle_error();
>  *
>  *  // get names of required extensions
>- *  if(!SDL_Vulkan_GetInstanceExtensions(window, &count, names))
>+ *  if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names))
>  *      handle_error();
>  *
>  *  // copy additional extensions after required extensions
>diff -r f958f3c2e006 -r a3ab95ff02ba src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Thu Aug 23 14:05:25 2018 -0700
>+++ b/src/video/SDL_video.c	Thu Aug 23 21:13:01 2018 -0700
>@@ -4103,11 +4103,14 @@
> 
> SDL_bool SDL_Vulkan_GetInstanceExtensions(SDL_Window *window, unsigned *count, const char **names)
> {
>-    CHECK_WINDOW_MAGIC(window, SDL_FALSE);
>-
>-    if (!(window->flags & SDL_WINDOW_VULKAN)) {
>-        SDL_SetError(NOT_A_VULKAN_WINDOW);
>-        return SDL_FALSE;
>+    if (window) {
>+        CHECK_WINDOW_MAGIC(window, SDL_FALSE);
>+
>+        if (!(window->flags & SDL_WINDOW_VULKAN))
>+        {
>+            SDL_SetError(NOT_A_VULKAN_WINDOW);
>+            return SDL_FALSE;
>+        }
>     }
> 
>     if (!count) {
>diff -r f958f3c2e006 -r a3ab95ff02ba test/testvulkan.c
>--- a/test/testvulkan.c	Thu Aug 23 14:05:25 2018 -0700
>+++ b/test/testvulkan.c	Thu Aug 23 21:13:01 2018 -0700
>@@ -255,7 +255,7 @@
>     appInfo.apiVersion = VK_API_VERSION_1_0;
>     instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
>     instanceCreateInfo.pApplicationInfo = &appInfo;
>-    if(!SDL_Vulkan_GetInstanceExtensions(state->windows[0], &extensionCount, NULL))
>+    if(!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, NULL))
>     {
>         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
>                      "SDL_Vulkan_GetInstanceExtensions(): %s\n",
>@@ -268,7 +268,7 @@
>         SDL_OutOfMemory();
>         quit(2);
>     }
>-    if(!SDL_Vulkan_GetInstanceExtensions(state->windows[0], &extensionCount, extensions))
>+    if(!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, extensions))
>     {
>         SDL_free((void*)extensions);
>         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,

Actions: View

Attachments on bug 4235: 3286 | 3288

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.