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>

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 3e54d6020656aa036c9985fb31eebb66e21005e9..2122ae9ed48eec0e49ed55ee3300cc2f5a17736a 100644 (file)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -487,6 +487,19 @@ struct __DRIuseInvalidateExtensionRec {
  */
 #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
  * GLX or EGL standards are not in the table, as they must be provided

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 123c87cbac9be6a1f7917812b21f9fb270ae586b..7e22906318df49913c84bb4711277d8dba003e71 100644 (file)
--- 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 f1d1164571ec80b3d5c658f28bc5dd076208da1c..22ba248cfb0022ec63e8f9d41fcbf78ccf15d956 100644 (file)
--- 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 2ebcb812732f929b02ecb98b561f23b36a2c18d5..4fe0d3faf98d11505f5dbeb787e51bbc506b5af6 100644 (file)
--- 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 a1475b02ba61cd5e79344c6b445f1379582e403c..0b89e3e91c9e20d8f963c962a95bdd0531d93e6a 100644 (file)
--- 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 393be205d88109c1ea62d4d3c73bd3d51a492c0b..a7d084348772e742fcd16a111b591bc1a184efeb 100644 (file)
--- 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)