Re: [PATCH 6/7] dxgi: Store parents in textures.

[Henri Verbeet]

On 31 August 2015 at 00:25, Stefan Dösinger <stefan(a)codeweavers.com> wrote:
> @@ -2875,7 +2875,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
>      TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",
>              device_parent, container_parent, surface, parent, parent_ops);
>
> -    *parent = container_parent;
> +    *parent = NULL;
>      *parent_ops = &d3d10_null_wined3d_parent_ops;
>
> return S_OK;
> I don't get what this patch is trying to achieve. For one, the
> description doesn't quite seem to match what it does. As it is, it
> looks like an odd mix of making it harder to get at the d3d11 texture
> from the wined3d surface and some bits that should have been in an
> earlier patch.

[PATCH 6/7] dxgi: Store parents in textures.

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 2015-08-31 um 13:01 schrieb Henri Verbeet:
> I don't get what this patch is trying to achieve. For one, the 
> description doesn't quite seem to match what it does. As it is, it 
> looks like an odd mix of making it harder to get at the d3d11
> texture from the wined3d surface and some bits that should have
> been in an earlier patch.
> The idea of this patch and the next one is to avoid using
> wined3d_surface in dxgi and friends. So yeah, it makes it harder to
> get the d3d11 texture from the wined3d surface because it won't be
> necessary to do that any more.

The way I split the patches seems reasonable to me to avoid making too
many changes at once.

(There's one more use of wined3d_surface left in d3d11, but this just
temporarily gets the surface to call wined3d_surface_map and doesn't
store it anywhere).

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJV5DfIAAoJEN0/YqbEcdMw2hIP+QGO2s7ECuBYXygQgtO80Cwn
k6MWscKv5BiRTzsq/r7sVcvNkXXM2uDxcocsvSmD89qzG7FmRErxuVNohj9XNdk4
esQnxANlH5qfKduooaIqAlm/QKuElZiBJQHYJEVkKQeuHzT7Gu1ajilDLwAa0tP0
reVLufI0/K8IeeKsA4ErJm4W6CwbOoscTwZ+rxU6Nq6iXE3teNqtxZBGtMt1gtOn
47wFpLK35PM4axdlCQ6TMce2iccgUebEv5eN2WiZLzYZjtFAurFBVteTHfLROojz
X24J6wEGHmdtrh8+E9eVahKKKWTgvVwD/J0T8vcEPJVrkMr4Rp/cg+hX3DNCo4qp
niqk7J/QAb2Gk67LhVyoDviJ8xNOJvZ7haQo8AdohJ+DHLYMvD2oWZcpR6vpt9O4
gLg1tLAWoVyiEOD+NeAYH52mDOM2lWH0x5L+WeCbtOaqLx1/UTn5+GRrzBQfEs1b
ACigpZ+x2CUwTfiWfuoiZGrfoLC8rWWErlFcWRK4oT2AoP47V7I32qijv93NccUX
FXpZUgDjBNRCBnw0sO5n8GYYMb9DKWYbzrex/SyTXpHWNFlexyuACGgWLz+Mq+YK
TI5Yf3pShP+K8ifPCySNP0Z208M0BM8quvlJ7BfhLSp3iXxuR/W+a4nENy8fsWiR
jPPlGyvWqREtq4eg925y
=g+20
-----END PGP SIGNATURE-----

[PATCH 6/7] dxgi: Store parents in textures.

[Henri Verbeet]

On 31 August 2015 at 13:17, Stefan Dösinger <stefandoesinger(a)gmail.com> wrote:
> The idea of this patch and the next one is to avoid using
> wined3d_surface in dxgi and friends. So yeah, it makes it harder to
> get the d3d11 texture from the wined3d surface because it won't be
> necessary to do that any more.

In itself that's fine.
> The way I split the patches seems reasonable to me to avoid making too
> many changes at once.

The way things are split between 114101/114105/114106 mostly just adds
noise. I.e., folding the swapchain.c changes in this patch into 114101
makes that patch simpler, and folding the (dxgi) device.c changes from
this patch into the next one gets rid of the temporary
wined3d_surface_get_container() function without making that patch
significantly more complicated. You can still (trivially) set the
surface parent to NULL at the end of the series, although you should
probably do the same for volumes in that case.