Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add count parameter to sfVulkan_getGraphicsRequiredInstanceExtensions #229

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/SFML/Window/Vulkan.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Window/Export.h>
#include <stddef.h>


typedef struct VkInstance_T* VkInstance;
Expand Down Expand Up @@ -76,7 +77,9 @@ CSFML_WINDOW_API sfVulkanFunctionPointer sfVulkan_getFunction(const char* name);
////////////////////////////////////////////////////////////
/// \brief Get Vulkan instance extensions required for graphics
///
/// \param count Pointer to a variable that will be filled with the number of instance extensions in the array
///
/// \return Vulkan instance extensions required for graphics
///
////////////////////////////////////////////////////////////
CSFML_WINDOW_API const char* const* sfVulkan_getGraphicsRequiredInstanceExtensions(void);
CSFML_WINDOW_API const char* const* sfVulkan_getGraphicsRequiredInstanceExtensions(size_t* count);
9 changes: 7 additions & 2 deletions src/SFML/Window/Vulkan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ sfVulkanFunctionPointer sfVulkan_getFunction(const char* name)


////////////////////////////////////////////////////////////
const char* const* sfVulkan_getGraphicsRequiredInstanceExtensions()
const char* const* sfVulkan_getGraphicsRequiredInstanceExtensions(size_t* count)
{
return &sf::Vulkan::getGraphicsRequiredInstanceExtensions()[0];
static std::vector<const char*> extensions = sf::Vulkan::getGraphicsRequiredInstanceExtensions();

if (count)
*count = extensions.size();

return !extensions.empty() ? &extensions[0] : NULL;
}
Loading