On Tue, Jul 04, 2017 at 10:18:21PM +0300, Martin Storsjö wrote:
> --- a/configure
> +++ b/configure
> @@ -4894,7 +4894,14 @@ fi
>
> # d3d11va requires linking directly to dxgi and d3d11 if not building for
> # the desktop api partition
> -enabled LoadLibrary || d3d11va_extralibs="-ldxgi -ld3d11"
> +check_cpp <<EOF || d3d11va_extralibs="-ldxgi -ld3d11"
> +#ifdef WINAPI_FAMILY
> +#include <winapifamily.h>
> +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
> +#error not desktop
> +#endif
> +#endif
> +EOF
Add "uwp" or whatever to HAVE_LIST, test for and enable it here, then
> --- a/libavutil/hwcontext_d3d11va.c
> +++ b/libavutil/hwcontext_d3d11va.c
> @@ -47,6 +47,13 @@
> #include "pixdesc.h"
> #include "pixfmt.h"
>
> +#ifdef WINAPI_FAMILY
> +#include <winapifamily.h>
> +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
> +#define UWP
> +#endif
> +#endif
you don't need to do this dance here and instead
> @@ -56,7 +63,7 @@ static PFN_D3D11_CREATE_DEVICE mD3D11CreateDevice;
>
> static av_cold void load_functions(void)
> {
> -#if HAVE_LOADLIBRARY
> +#ifndef UWP
check for HAVE_UWP or whatever at this point.
Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
