mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor platform selection for clarity?

Browse Source
This commit is contained in:
Camilla Löwy 2021-10-25 21:11:26 +02:00
parent 76a5f781db
commit 2a78a2cf82
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform.c
View File

@ -73,31 +73,34 @@ GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
if (desiredID == GLFW_PLATFORM_NULL) if (desiredID == GLFW_PLATFORM_NULL)
return _glfwConnectNull(desiredID, platform); return _glfwConnectNull(desiredID, platform);
// If there is only one platform available for auto-selection, let it emit the error if (desiredID == GLFW_ANY_PLATFORM)
// on failure as the platform-specific error description may be more helpful {
if (desiredID == GLFW_ANY_PLATFORM && count == 1) // If there is exactly one platform available for auto-selection, let it emit the
// error on failure as the platform-specific error description may be more helpful
if (count == 1)
return supportedPlatforms[0].connect(supportedPlatforms[0].ID, platform); return supportedPlatforms[0].connect(supportedPlatforms[0].ID, platform);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{
if (desiredID == GLFW_ANY_PLATFORM || desiredID == supportedPlatforms[i].ID)
{ {
if (supportedPlatforms[i].connect(desiredID, platform)) if (supportedPlatforms[i].connect(desiredID, platform))
return GLFW_TRUE; return GLFW_TRUE;
else if (desiredID == supportedPlatforms[i].ID)
return GLFW_FALSE;
}
} }
if (desiredID == GLFW_ANY_PLATFORM)
{
if (count) if (count)
_glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Failed to detect any supported platform"); _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "Failed to detect any supported platform");
else else
_glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "This binary only supports the Null platform"); _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "This binary only supports the Null platform");
} }
else else
{
for (i = 0; i < count; i++)
{
if (supportedPlatforms[i].ID == desiredID)
return supportedPlatforms[i].connect(desiredID, platform);
}
_glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "The requested platform is not supported"); _glfwInputError(GLFW_PLATFORM_UNAVAILABLE, "The requested platform is not supported");
}
return GLFW_FALSE; return GLFW_FALSE;
} }