[Mesa-dev] [PATCH v2 01/13] vl/dri3: add DRI3 support and implement create and destroy

[Jose Fonseca]

On 12/05/16 18:13, Leo Liu wrote:
> required functions into place for implementation, create screen
> with device fd returned from X server, also bail out to DRI2
> with certain conditions.
>
> v2: -organize the error out path (Axel)
>      -squash previous patch 1 and 2 into one (Emil)
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
[...]

> diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
> index 84da85c..44b3fec 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -354,6 +354,11 @@ VL_WINSYS_SOURCES := \
>   	vl/vl_winsys_dri.c \
>   	vl/vl_winsys_drm.c
>
> +if HAVE_DRI3

Makefile.sources must only have variable definitions.

Makefile.sources are shared with SCons, but the SCons glue is only able 
to parse very limited constructs.

(Scons builds broke as result.)

> +VL_WINSYS_SOURCES += \
> +	vl/vl_winsys_dri3.c
> +endif
> +
>   VL_STUB_SOURCES := \
>   	vl/vl_stubs.c
>

The solution here is to have a

   VL_WINSYS_SOURCES_DRI3 = vl/vl_winsys_dri3.c

Then move the `if HAVE_DRI3` to the autotools logic.

Or maybe simpler, always add vl/vl_winsys_dri3.c, and have a #ifdef in C.


Jose