[Mesa-dev] [PATCH 10/15] nouveau: Build the driver into the shared mesa_dri_drivers.so.

[Emil Velikov]

On 12/10/13 02:03, Eric Anholt wrote:
> v2: drop dridir now that it's unused.
> v3: Consistently put spaces around += in the updated Makefile.am block.
> v4: Set a global driverAPI variable so loaders don't have to update to
>     createNewScreen2() (though they may want to for thread safety).
> 
> Reviewed-by: Matt Turner <mattst88 at gmail.com> (v2)
> ---
>  configure.ac                                  |  2 +-
>  src/mesa/drivers/dri/Makefile.am              |  4 +++-
>  src/mesa/drivers/dri/nouveau/Makefile.am      | 20 +++-----------------
>  src/mesa/drivers/dri/nouveau/nouveau_screen.c | 17 +++++++++++++++--
>  src/mesa/drivers/dri/nouveau/nouveau_screen.h |  2 ++
>  5 files changed, 24 insertions(+), 21 deletions(-)
> 
[...]
> diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
> index 6816406..8701e49 100644
> --- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
> +++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
> @@ -246,7 +246,7 @@ static const __DRIextension *nouveau_screen_extensions[] = {
>      NULL
>  };
>  
> -const struct __DriverAPIRec driDriverAPI = {
> +const struct __DriverAPIRec nouveau_driver_api = {
static const struct...

>  	.InitScreen      = nouveau_init_screen2,
>  	.DestroyScreen   = nouveau_destroy_screen,
>  	.CreateBuffer    = nouveau_create_buffer,
> @@ -257,9 +257,22 @@ const struct __DriverAPIRec driDriverAPI = {
>  	.UnbindContext   = nouveau_context_unbind,
>  };
>  
> +static const struct __DRIDriverVtableExtensionRec nouveau_vtable = {
> +   .base = { __DRI_DRIVER_VTABLE, 1 },
> +   .vtable = &nouveau_driver_api,
> +};
> +
>  /* This is the table of extensions that the loader will dlsym() for. */
> -PUBLIC const __DRIextension *__driDriverExtensions[] = {
> +PUBLIC const __DRIextension *nouveau_driver_extensions[] = {
static const __DRIextension ...

Cheers
Emil