[Mesa-dev] [PATCH 2/2] vc4: Take precedence over ilo when in simulator mode.

[Emil Velikov]

Hi Eric,

On 22 November 2015 at 02:47, Eric Anholt <eric at anholt.net> wrote:
> They're exclusive at build time, but the ilo entry is always present, so
> we'd try to use it and fail out.
> ---
>  src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> index b5dfc56..2f955e2 100644
> --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> @@ -94,6 +94,14 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
>          .create_screen = pipe_i915_create_screen,
>          .configuration = configuration_query,
>      },
Can you please add a small comment here or alternatively keep the hunk
where it is, but wrap the ILO entry in ifndef USE_VC4_SIMULATOR.

I'm thinking about the following but in all means do tweak it to your linking
"VC4 simulator and ILO (i965) are mutually exclusive (error at
configure). As the latter is unconditionally added, move this one at
the top."

> +#ifdef USE_VC4_SIMULATOR
> +    {
> +        .name = "i965",
> +        .driver_name = "vc4",
> +        .create_screen = pipe_vc4_create_screen,
> +        .configuration = configuration_query,
> +    },
> +#endif
>      {
>          .name = "i965",
>          .driver_name = "i915",
> @@ -154,14 +162,6 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
>          .create_screen = pipe_vc4_create_screen,
>          .configuration = configuration_query,
>      },
> -#ifdef USE_VC4_SIMULATOR
> -    {
> -        .name = "i965",
> -        .driver_name = "vc4",
> -        .create_screen = pipe_vc4_create_screen,
> -        .configuration = configuration_query,
> -    },
> -#endif
>  };
>  #endif
>

Out of curiosity how painful would be the to remove the i965, entity
from your simulator setup ?

With either one of the above suggestions, the series is:

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

Sorry for breaking VC4. Hope it didn't cause too much headaches to fix.

-Emil