glx: Add an optional function call for getting the DRI driver interface.
The previous interface relied on a static struct, which meant that the driver didn't get a chance to edit the struct before the struct got used. For megadrivers, I want struct specific to the driver being loaded. v2: Fix the prototype in the docs (caught by Marek). Since the driver name was in the function, we didn't need to also pass it in. v3: Fix asprintf error checking (caught by Matt's gcc). Reviewed-by: Matt Turner <mattst88@gmail.com> (v1) Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
6868923702
commit
fcb57a8210
|
@ -487,6 +487,19 @@ struct __DRIuseInvalidateExtensionRec {
|
||||||
*/
|
*/
|
||||||
#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"
|
#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This symbol replaces the __DRI_DRIVER_EXTENSIONS symbol, and will be
|
||||||
|
* suffixed by "_drivername", allowing multiple drivers to be built into one
|
||||||
|
* library, and also giving the driver the chance to return a variable driver
|
||||||
|
* extensions struct depending on the driver name being loaded or any other
|
||||||
|
* system state.
|
||||||
|
*
|
||||||
|
* The function prototype is:
|
||||||
|
*
|
||||||
|
* const __DRIextension **__driDriverGetExtensions_drivername(void);
|
||||||
|
*/
|
||||||
|
#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tokens for __DRIconfig attribs. A number of attributes defined by
|
* Tokens for __DRIconfig attribs. A number of attributes defined by
|
||||||
* GLX or EGL standards are not in the table, as they must be provided
|
* GLX or EGL standards are not in the table, as they must be provided
|
||||||
|
|
|
@ -1183,7 +1183,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
|
||||||
goto handle_error;
|
goto handle_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
extensions = driGetDriverExtensions(psc->driver);
|
extensions = driGetDriverExtensions(psc->driver, driverName);
|
||||||
if (extensions == NULL)
|
if (extensions == NULL)
|
||||||
goto handle_error;
|
goto handle_error;
|
||||||
|
|
||||||
|
|
|
@ -188,9 +188,24 @@ driOpenDriver(const char *driverName)
|
||||||
}
|
}
|
||||||
|
|
||||||
_X_HIDDEN const __DRIextension **
|
_X_HIDDEN const __DRIextension **
|
||||||
driGetDriverExtensions(void *handle)
|
driGetDriverExtensions(void *handle, const char *driver_name)
|
||||||
{
|
{
|
||||||
const __DRIextension **extensions = NULL;
|
const __DRIextension **extensions = NULL;
|
||||||
|
const __DRIextension **(*get_extensions)(void);
|
||||||
|
char *get_extensions_name;
|
||||||
|
|
||||||
|
if (asprintf(&get_extensions_name, "%s_%s",
|
||||||
|
__DRI_DRIVER_GET_EXTENSIONS, driver_name) != -1) {
|
||||||
|
get_extensions = dlsym(handle, get_extensions_name);
|
||||||
|
if (get_extensions) {
|
||||||
|
free(get_extensions_name);
|
||||||
|
return get_extensions();
|
||||||
|
} else {
|
||||||
|
InfoMessageF("driver does not expose %s(): %s\n",
|
||||||
|
get_extensions_name, dlerror());
|
||||||
|
free(get_extensions_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
extensions = dlsym(handle, __DRI_DRIVER_EXTENSIONS);
|
extensions = dlsym(handle, __DRI_DRIVER_EXTENSIONS);
|
||||||
if (extensions == NULL) {
|
if (extensions == NULL) {
|
||||||
|
|
|
@ -69,7 +69,8 @@ extern void CriticalErrorMessageF(const char *f, ...);
|
||||||
|
|
||||||
extern void *driOpenDriver(const char *driverName);
|
extern void *driOpenDriver(const char *driverName);
|
||||||
|
|
||||||
extern const __DRIextension **driGetDriverExtensions(void *handle);
|
extern const __DRIextension **
|
||||||
|
driGetDriverExtensions(void *handle, const char *driver_name);
|
||||||
|
|
||||||
extern bool
|
extern bool
|
||||||
dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
|
dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
|
||||||
|
|
|
@ -189,7 +189,7 @@ glXGetDriverConfig(const char *driverName)
|
||||||
if (!handle)
|
if (!handle)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
extensions = driGetDriverExtensions(handle);
|
extensions = driGetDriverExtensions(handle, driverName);
|
||||||
if (extensions) {
|
if (extensions) {
|
||||||
for (int i = 0; extensions[i]; i++) {
|
for (int i = 0; extensions[i]; i++) {
|
||||||
if (strcmp(extensions[i]->name, __DRI_CONFIG_OPTIONS) == 0)
|
if (strcmp(extensions[i]->name, __DRI_CONFIG_OPTIONS) == 0)
|
||||||
|
|
|
@ -664,11 +664,9 @@ driswCreateScreen(int screen, struct glx_display *priv)
|
||||||
if (psc->driver == NULL)
|
if (psc->driver == NULL)
|
||||||
goto handle_error;
|
goto handle_error;
|
||||||
|
|
||||||
extensions = dlsym(psc->driver, __DRI_DRIVER_EXTENSIONS);
|
extensions = driGetDriverExtensions(psc->driver, SWRAST_DRIVER_NAME);
|
||||||
if (extensions == NULL) {
|
if (extensions == NULL)
|
||||||
ErrorMessageF("driver exports no extensions (%s)\n", dlerror());
|
|
||||||
goto handle_error;
|
goto handle_error;
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; extensions[i]; i++) {
|
for (i = 0; extensions[i]; i++) {
|
||||||
if (strcmp(extensions[i]->name, __DRI_CORE) == 0)
|
if (strcmp(extensions[i]->name, __DRI_CORE) == 0)
|
||||||
|
|
Loading…
Reference in New Issue