From 9224a0a2d84bf58cd50c7a10450008e598ae144d Mon Sep 17 00:00:00 2001
From: ilyas-taouaou <[EMAIL REDACTED]>
Date: Thu, 2 Nov 2023 18:54:27 +0100
Subject: [PATCH] Fix emscripten, android, uikit and windows
---
include/SDL3/SDL_vulkan.h | 2 --
src/video/android/SDL_androidvulkan.h | 5 ++---
src/video/uikit/SDL_uikitvulkan.h | 5 ++---
src/video/windows/SDL_windowsvulkan.h | 5 ++---
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/include/SDL3/SDL_vulkan.h b/include/SDL3/SDL_vulkan.h
index 3b2cd31894e4..6499f12bd03e 100644
--- a/include/SDL3/SDL_vulkan.h
+++ b/include/SDL3/SDL_vulkan.h
@@ -152,8 +152,6 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void);
*
* \param pCount A pointer to an unsigned int corresponding to the number of
* extensions to be returned
- * \param pNames NULL or a pointer to an array to be filled with required
- * Vulkan instance extensions
* \returns SDL_TRUE on success, SDL_FALSE on error.
*
* \since This function is available since SDL 3.0.0.
diff --git a/src/video/android/SDL_androidvulkan.h b/src/video/android/SDL_androidvulkan.h
index 1b059c43d6bc..e538ca917a2e 100644
--- a/src/video/android/SDL_androidvulkan.h
+++ b/src/video/android/SDL_androidvulkan.h
@@ -36,9 +36,8 @@
int Android_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path);
void Android_Vulkan_UnloadLibrary(SDL_VideoDevice *_this);
-SDL_bool Android_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
- unsigned *count,
- const char **names);
+char const* const* Android_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+ Uint32 *count);
SDL_bool Android_Vulkan_CreateSurface(SDL_VideoDevice *_this,
SDL_Window *window,
VkInstance instance,
diff --git a/src/video/uikit/SDL_uikitvulkan.h b/src/video/uikit/SDL_uikitvulkan.h
index 0e13675672e5..432edda9460d 100644
--- a/src/video/uikit/SDL_uikitvulkan.h
+++ b/src/video/uikit/SDL_uikitvulkan.h
@@ -36,9 +36,8 @@
int UIKit_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path);
void UIKit_Vulkan_UnloadLibrary(SDL_VideoDevice *_this);
-SDL_bool UIKit_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
- unsigned *count,
- const char **names);
+char const* const* UIKit_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+ Uint32 *count);
SDL_bool UIKit_Vulkan_CreateSurface(SDL_VideoDevice *_this,
SDL_Window *window,
VkInstance instance,
diff --git a/src/video/windows/SDL_windowsvulkan.h b/src/video/windows/SDL_windowsvulkan.h
index 17b69687ca52..0fffcbf4278c 100644
--- a/src/video/windows/SDL_windowsvulkan.h
+++ b/src/video/windows/SDL_windowsvulkan.h
@@ -36,9 +36,8 @@
int WIN_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path);
void WIN_Vulkan_UnloadLibrary(SDL_VideoDevice *_this);
-SDL_bool WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
- unsigned *count,
- const char **names);
+char const* const* WIN_Vulkan_GetInstanceExtensions(SDL_VideoDevice *_this,
+ Uint32 *count);
SDL_bool WIN_Vulkan_CreateSurface(SDL_VideoDevice *_this,
SDL_Window *window,
VkInstance instance,