Re: [v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect

[Henri Verbeet]

On 11 October 2015 at 13:29, Riccardo Bortolato  wrote:
> diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
> index 20027a7..8f66112 100644
> --- a/dlls/d3d11/device.c
> +++ b/dlls/d3d11/device.c
> @@ -3007,11 +3007,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
>  }
>
> static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
> -
>    void *container_parent, struct wined3d_surface *surface, void **parent,
> -
>    struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent,
>    const struct wined3d_parent_ops **parent_ops)
>
> {
> - TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",
> -
>        device_parent, container_parent, surface, parent, parent_ops);
> -
>
> TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
> -
>        device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
>
> *parent = NULL;
>    *parent_ops = &d3d10_null_wined3d_parent_ops;

This series looks fine, but there's a (trivial) merge conflict due to
commit a865b14aedb01def345c09732717c3c5f2eb6dab.

[v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect

[Riccardo Bortolato]

Unfortunately I rebased after I sent the serie, however my git was
able to automatically merge this, weird.

Not a big deal though, I just resent it.

Ciao,
Riccardo

2015-10-12 12:41 GMT+02:00 Henri Verbeet :
> On 11 October 2015 at 13:29, Riccardo Bortolato  wrote:
> > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
> > index 20027a7..8f66112 100644
> > --- a/dlls/d3d11/device.c
> > +++ b/dlls/d3d11/device.c
> > @@ -3007,11 +3007,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa
> >  }
> >
> > static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
> > -
> >    void *container_parent, struct wined3d_surface *surface, void **parent,
> > -
> >    struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent,
> >    const struct wined3d_parent_ops **parent_ops)
> >
> > {
> > - TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",
> > -
> >        device_parent, container_parent, surface, parent, parent_ops);
> > -
> >
> > TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",
> > -
> >        device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);
> >
> > *parent = NULL;
> >    *parent_ops = &d3d10_null_wined3d_parent_ops;
>
> This series looks fine, but there's a (trivial) merge conflict due to
> commit a865b14aedb01def345c09732717c3c5f2eb6dab.

[v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect

[Hin-Tak Leung]

It is possible to get at your pre-rebase HEAD, within 2 weeks of such an event, by finding the old HEAD's sha1 , from 'git reflog'. The two week limit is from git's gc auto default. If this helps.