summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-09-23 14:44:10 -0700
committerEric Anholt <eric@anholt.net>2013-10-24 14:04:20 -0700
commitfcb57a8210e819cc14a39c79f23530eb22296da0 (patch)
tree306eca1c0435a67820adffbc553737868e07d911 /src/glx
parent6868923702d5cdb93d06627ea4f40abe99cda75a (diff)
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>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/dri2_glx.c2
-rw-r--r--src/glx/dri_common.c17
-rw-r--r--src/glx/dri_common.h3
-rw-r--r--src/glx/dri_glx.c2
-rw-r--r--src/glx/drisw_glx.c6
5 files changed, 22 insertions, 8 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 123c87cbac9..7e22906318d 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1183,7 +1183,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
goto handle_error;
}
- extensions = driGetDriverExtensions(psc->driver);
+ extensions = driGetDriverExtensions(psc->driver, driverName);
if (extensions == NULL)
goto handle_error;
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index f1d1164571e..22ba248cfb0 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -188,9 +188,24 @@ driOpenDriver(const char *driverName)
}
_X_HIDDEN const __DRIextension **
-driGetDriverExtensions(void *handle)
+driGetDriverExtensions(void *handle, const char *driver_name)
{
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);
if (extensions == NULL) {
diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 2ebcb812732..4fe0d3faf98 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -69,7 +69,8 @@ extern void CriticalErrorMessageF(const char *f, ...);
extern void *driOpenDriver(const char *driverName);
-extern const __DRIextension **driGetDriverExtensions(void *handle);
+extern const __DRIextension **
+driGetDriverExtensions(void *handle, const char *driver_name);
extern bool
dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index a1475b02ba6..0b89e3e91c9 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -189,7 +189,7 @@ glXGetDriverConfig(const char *driverName)
if (!handle)
return NULL;
- extensions = driGetDriverExtensions(handle);
+ extensions = driGetDriverExtensions(handle, driverName);
if (extensions) {
for (int i = 0; extensions[i]; i++) {
if (strcmp(extensions[i]->name, __DRI_CONFIG_OPTIONS) == 0)
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 393be205d88..a7d08434877 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -664,11 +664,9 @@ driswCreateScreen(int screen, struct glx_display *priv)
if (psc->driver == NULL)
goto handle_error;
- extensions = dlsym(psc->driver, __DRI_DRIVER_EXTENSIONS);
- if (extensions == NULL) {
- ErrorMessageF("driver exports no extensions (%s)\n", dlerror());
+ extensions = driGetDriverExtensions(psc->driver, SWRAST_DRIVER_NAME);
+ if (extensions == NULL)
goto handle_error;
- }
for (i = 0; extensions[i]; i++) {
if (strcmp(extensions[i]->name, __DRI_CORE) == 0)