On 31 August 2015 at 00:25, Stefan Dösinger stefan@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.
-----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).
On 31 August 2015 at 13:17, Stefan Dösinger stefandoesinger@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.
-
Henri Verbeet -
Stefan Dösinger