picnoir/libglvnd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

GLX: Clean up __glXFetchDispatchEntry.

Browse source 
Some minor cleanup of __glXFetchDispatchEntry.

Handle the various failure cases more directly: If we can't find a name, or if
the vendor library doesn't support a function, then return early.

If we can't allocate a cache entry for the function, then return the dispatch
stub anyway. It can try to store the stub again next time.
This commit is contained in:
Kyle Brenneman 2016-05-03 15:06:11 -06:00
parent b6a1d5a5b5
commit 39070d4e59
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/GLX/libglxmapping.c
View file

@ -300,41 +300,42 @@ __GLXextFuncPtr __glXFetchDispatchEntry(__GLXvendorInfo *vendor,
LKDHASH_UNLOCK(vendor->dynDispatchHash);
if (!pEntry) {
// Not seen before by this vendor: query the vendor for the right
// address to use.
if (addr != NULL) {
return addr;
}
__glvndPthreadFuncs.rwlock_wrlock(&dispatchIndexLock);
procName = (const GLubyte *) __glvndWinsysDispatchGetName(index);
__glvndPthreadFuncs.rwlock_unlock(&dispatchIndexLock);
// Not seen before by this vendor: query the vendor for the right
// address to use.
// This should have a valid entry point associated with it.
__glvndPthreadFuncs.rwlock_rdlock(&dispatchIndexLock);
procName = (const GLubyte *) __glvndWinsysDispatchGetName(index);
__glvndPthreadFuncs.rwlock_unlock(&dispatchIndexLock);
// This should have a valid entry point associated with it.
if (procName == NULL) {
assert(procName);
return NULL;
}
if (procName) {
// Get the real address
addr = vendor->glxvc->getProcAddress(procName);
}
// Get the real address
addr = vendor->glxvc->getProcAddress(procName);
if (addr == NULL) {
return NULL;
}
LKDHASH_WRLOCK(vendor->dynDispatchHash);
HASH_FIND_INT(_LH(vendor->dynDispatchHash), &index, pEntry);
if (!pEntry) {
pEntry = malloc(sizeof(*pEntry));
if (!pEntry) {
// Uh-oh!
assert(pEntry);
LKDHASH_UNLOCK(vendor->dynDispatchHash);
return NULL;
}
LKDHASH_WRLOCK(vendor->dynDispatchHash);
HASH_FIND_INT(_LH(vendor->dynDispatchHash), &index, pEntry);
if (!pEntry) {
// If this malloc fails, then it's not fatal. It just means we'll
// have to query the vendor library again next time.
pEntry = malloc(sizeof(*pEntry));
if (pEntry != NULL) {
pEntry->index = index;
pEntry->addr = addr;
HASH_ADD_INT(_LH(vendor->dynDispatchHash), index, pEntry);
} else {
addr = pEntry->addr;
}
LKDHASH_UNLOCK(vendor->dynDispatchHash);
}
LKDHASH_UNLOCK(vendor->dynDispatchHash);
return addr;
}