Re: [PATCH 1/4] include: Add declarations for D3DUSAGEs added with d3d9ex.

[Henri Verbeet]

On 7 January 2016 at 16:22, Józef Kucia <jkucia(a)codeweavers.com> wrote:
> +/* Parts added with d3d9ex */
> +#if !defined(D3D_DISABLE_9EX)
> +#define D3DUSAGE_RESTRICTED_CONTENT              __MSABI_LONG(0x00000800)
> +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000)
> +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE        __MSABI_LONG(0x00002000)
> +#define D3DUSAGE_TEXTAPI                         __MSABI_LONG(0x10000000)

That's a bit of a problem, D3DUSAGE_TEXTAPI conflicts with
WINED3DUSAGE_TEXTURE. These would also get masked out by
WINED3DUSAGE_MASK.

[PATCH 1/4] include: Add declarations for D3DUSAGEs added with d3d9ex.

[Józef Kucia]

On Fri, Jan 8, 2016 at 2:16 AM, Henri Verbeet <hverbeet(a)gmail.com> wrote:
> On 7 January 2016 at 16:22, Józef Kucia <jkucia(a)codeweavers.com> wrote:
> > +/* Parts added with d3d9ex */
> > +#if !defined(D3D_DISABLE_9EX)
> > +#define D3DUSAGE_RESTRICTED_CONTENT              __MSABI_LONG(0x00000800)
> > +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000)
> > +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE        __MSABI_LONG(0x00002000)
> > +#define D3DUSAGE_TEXTAPI                         __MSABI_LONG(0x10000000)
>
> That's a bit of a problem, D3DUSAGE_TEXTAPI conflicts with
> WINED3DUSAGE_TEXTURE. These would also get masked out by
> WINED3DUSAGE_MASK.

The patch 117898 [1] allows to pass all usage flags introduced with
d3d9ex to wined3d.

[1] - https://www.winehq.org/pipermail/wine-patches/2016-January/145825.html