[Mesa-dev] [PATCH 1/4] st/dri: use driver name for driconf section lookup

[Vadim Girlin]

On Thu, 2012-04-12 at 04:41 +0400, Vadim Girlin wrote:
> The name is taken from the driver_descriptor, so it will be the same as

Hmm, sorry, it seems I overlooked somehow that this patch breaks the
build for swrast due to missing "driver_descriptor".

Could we simply add the driver_descriptor for swrast, to store the
driver name?

AFAICS the addition of the following lines to
gallium/targets/dri-swrast/swrast_drm_api.c solves the problem:

> #include "state_tracker/drm_driver.h"
> 
> DRM_DRIVER_DESCRIPTOR("swrast", NULL, NULL, NULL);

Is it correct? Also, probably I missed something else?

Vadim


> expected by driconf utility.
> 
> Signed-off-by: Vadim Girlin <vadimgirlin at gmail.com>
> ---
>  .../state_trackers/dri/common/dri_context.c        |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
> index e07e168..9e59023 100644
> --- a/src/gallium/state_trackers/dri/common/dri_context.c
> +++ b/src/gallium/state_trackers/dri/common/dri_context.c
> @@ -34,6 +34,7 @@
>  #include "dri_screen.h"
>  #include "dri_drawable.h"
>  #include "dri_context.h"
> +#include "state_tracker/drm_driver.h"
>  
>  #include "pipe/p_context.h"
>  #include "state_tracker/st_context.h"
> @@ -104,7 +105,7 @@ dri_create_context(gl_api api, const struct gl_config * visual,
>     ctx->sPriv = sPriv;
>  
>     driParseConfigFiles(&ctx->optionCache,
> -		       &screen->optionCache, sPriv->myNum, "dri");
> +		       &screen->optionCache, sPriv->myNum, driver_descriptor.name);
>  
>     dri_fill_st_visual(&attribs.visual, screen, visual);
>     ctx->st = stapi->create_context(stapi, &screen->base, &attribs, &ctx_err,