#include <string.h>
+#include <stdlib.h>
#include <X11/Xlib.h>
#include "glvnd/libglxabi.h"
#include "glxglvnd.h"
-
static Bool __glXGLVNDIsScreenSupported(Display *dpy, int screen)
{
/* TODO: Think of a better heuristic... */
return glXGetProcAddressARB(procName);
}
-static int FindGLXFunction(const GLubyte *name)
+static int
+compare(const void *l, const void *r)
{
- unsigned first = 0;
- unsigned last = DI_FUNCTION_COUNT - 1;
-
- while (first <= last) {
- unsigned middle = (first + last) / 2;
- int comp = strcmp((const char *) name,
- __glXDispatchTableStrings[middle]);
-
- if (comp < 0)
- first = middle + 1;
- else if (comp > 0)
- last = middle - 1;
- else
- return middle;
- }
- return -1;
+ const char *s = *(const char **)r;
+ return strcmp(l, s);
}
-static void *__glXGLVNDGetDispatchAddress(const GLubyte *procName)
+static unsigned FindGLXFunction(const GLubyte *name)
{
- int internalIndex = FindGLXFunction(procName);
+ const char **match;
- if (internalIndex >= 0) {
- return __glXDispatchFunctions[internalIndex];
- }
+ match = bsearch(name, __glXDispatchTableStrings, DI_FUNCTION_COUNT,
+ sizeof(const char *), compare);
+
+ if (match == NULL)
+ return DI_FUNCTION_COUNT;
- return NULL;
+ return match - __glXDispatchTableStrings;
+}
+
+static void *__glXGLVNDGetDispatchAddress(const GLubyte *procName)
+{
+ unsigned internalIndex = FindGLXFunction(procName);
+
+ return __glXDispatchFunctions[internalIndex];
}
static void __glXGLVNDSetDispatchIndex(const GLubyte *procName, int index)
{
- int internalIndex = FindGLXFunction(procName);
+ unsigned internalIndex = FindGLXFunction(procName);
+
+ if (internalIndex == DI_FUNCTION_COUNT)
+ return; /* unknown or static dispatch */
- if (internalIndex >= 0)
- __glXDispatchTableIndices[internalIndex] = index;
+ __glXDispatchTableIndices[internalIndex] = index;
}
_X_EXPORT Bool __glx_Main(uint32_t version, const __GLXapiExports *exports,