summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Brenneman <kbrenneman@nvidia.com>2016-02-29 11:11:26 -0700
committerKyle Brenneman <kbrenneman@nvidia.com>2016-02-29 13:50:39 -0700
commitba1c58a558f2df4c9abfb69cbeb027f9128f22ad (patch)
treee81c4e46b930a64eae03e61f6c94936191c5d3df
parent88807b95b9d119b8812446ae8a1fc585f9770e94 (diff)
Rename a couple of functions in the ABI's.
Renamed __GLdispatchPatchCallbacks::checkPatchSupported to isPatchSupported, and renamed __GLXapiImports::checkSupportsScreen to isScreenSupported.
-rw-r--r--include/glvnd/GLdispatchABI.h2
-rw-r--r--include/glvnd/libglxabi.h2
-rw-r--r--src/GLX/libglxmapping.c2
-rw-r--r--src/GLdispatch/GLdispatch.c2
-rw-r--r--tests/GLX_dummy/GLX_dummy.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/include/glvnd/GLdispatchABI.h b/include/glvnd/GLdispatchABI.h
index ab70361..d0fea5e 100644
--- a/include/glvnd/GLdispatchABI.h
+++ b/include/glvnd/GLdispatchABI.h
@@ -98,7 +98,7 @@ typedef struct __GLdispatchPatchCallbacksRec {
* \param lookupStubOffset A callback into libglvnd to look up the address
* of each entrypoint.
*/
- GLboolean (* checkPatchSupported)(int type, int stubSize);
+ GLboolean (* isPatchSupported)(int type, int stubSize);
/*!
* Called by libglvnd to request that a vendor library patch its top-level
diff --git a/include/glvnd/libglxabi.h b/include/glvnd/libglxabi.h
index 4d25b24..93806e6 100644
--- a/include/glvnd/libglxabi.h
+++ b/include/glvnd/libglxabi.h
@@ -229,7 +229,7 @@ typedef struct __GLXapiImportsRec {
* \param screen The screen number.
* \return True if the vendor library can support this screen.
*/
- Bool (* checkSupportsScreen) (Display *dpy, int screen);
+ Bool (* isScreenSupported) (Display *dpy, int screen);
/*!
* This retrieves the pointer to the real GLX or core GL function.
diff --git a/src/GLX/libglxmapping.c b/src/GLX/libglxmapping.c
index 7701c24..b588efe 100644
--- a/src/GLX/libglxmapping.c
+++ b/src/GLX/libglxmapping.c
@@ -600,7 +600,7 @@ __GLXvendorInfo *__glXLookupVendorByScreen(Display *dpy, const int screen)
// Make sure that the vendor library can support this screen.
// If it can't, then we'll fall back to the indirect rendering
// library.
- if (vendor != NULL && !vendor->glxvc->checkSupportsScreen(dpy, screen)) {
+ if (vendor != NULL && !vendor->glxvc->isScreenSupported(dpy, screen)) {
vendor = NULL;
}
}
diff --git a/src/GLdispatch/GLdispatch.c b/src/GLdispatch/GLdispatch.c
index f68c525..f85b353 100644
--- a/src/GLdispatch/GLdispatch.c
+++ b/src/GLdispatch/GLdispatch.c
@@ -570,7 +570,7 @@ static int PatchEntrypoints(
GLboolean anySuccess = GL_FALSE;
glvnd_list_for_each_entry(stub, &dispatchStubList, entry) {
- if (patchCb->checkPatchSupported(stub->callbacks.getStubType(),
+ if (patchCb->isPatchSupported(stub->callbacks.getStubType(),
stub->callbacks.getStubSize()))
{
if (stub->callbacks.startPatch()) {
diff --git a/tests/GLX_dummy/GLX_dummy.c b/tests/GLX_dummy/GLX_dummy.c
index 2e15db8..436eb30 100644
--- a/tests/GLX_dummy/GLX_dummy.c
+++ b/tests/GLX_dummy/GLX_dummy.c
@@ -671,7 +671,7 @@ static void dummyReleasePatch(void)
static const __GLdispatchPatchCallbacks dummyPatchCallbacks =
{
- .checkPatchSupported = dummyCheckPatchSupported,
+ .isPatchSupported = dummyCheckPatchSupported,
.initiatePatch = dummyInitiatePatch,
.releasePatch = dummyReleasePatch,
};
@@ -679,7 +679,7 @@ static const __GLdispatchPatchCallbacks dummyPatchCallbacks =
static const __GLXapiImports dummyImports =
{
- .checkSupportsScreen = dummyCheckSupportsScreen,
+ .isScreenSupported = dummyCheckSupportsScreen,
.getProcAddress = dummyGetProcAddress,
.getDispatchAddress = dummyGetDispatchAddress,
.setDispatchIndex = dummySetDispatchIndex,