<table cellspacing="0" cellpadding="0" border="0"><tr><td valign="top"><div>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.</div></td></tr></table> <div id="_origMsg_">
<div>
<br />
<div>
<div style="font-size:0.9em">
<hr size="1">
<b>
<span style="font-weight:bold">From:</span>
</b>
Riccardo Bortolato <rikyz619@gmail.com>; <br>
<b>
<span style="font-weight:bold">To:</span>
</b>
Henri Verbeet <hverbeet@gmail.com>; <br>
<b>
<span style="font-weight:bold">Cc:</span>
</b>
wine-devel <wine-devel@winehq.org>; <br>
<b>
<span style="font-weight:bold">Subject:</span>
</b>
Re: [v2 1/6] d3d8: make use of wined3d_texture_map in d3d8_surface_LockRect <br>
<b>
<span style="font-weight:bold">Sent:</span>
</b>
Mon, Oct 12, 2015 10:45:31 AM <br>
</div>
<br>
<table cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr>
<td valign="top">Unfortunately I rebased after I sent the serie, however my git was<br clear="none">able to automatically merge this, weird.<br clear="none"><br clear="none">Not a big deal though, I just resent it.<br clear="none"><br clear="none">Ciao,<br clear="none">Riccardo<br clear="none"><div class="yqt6631499299" id="yqtfd98287"><br clear="none">2015-10-12 12:41 GMT+02:00 Henri Verbeet <<a shape="rect" ymailto="mailto:hverbeet@gmail.com" href="javascript:return">hverbeet@gmail.com</a>>:<br clear="none">> On 11 October 2015 at 13:29, Riccardo Bortolato <<a shape="rect" ymailto="mailto:rikyz619@gmail.com" href="javascript:return">rikyz619@gmail.com</a>> wrote:<br clear="none">>> diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c<br clear="none">>> index 20027a7..8f66112 100644<br clear="none">>> --- a/dlls/d3d11/device.c<br clear="none">>> +++ b/dlls/d3d11/device.c<br
clear="none">>> @@ -3007,11 +3007,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa<br clear="none">>>� }<br clear="none">>><br clear="none">>>� static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,<br clear="none">>> -� � � � void *container_parent, struct wined3d_surface *surface, void **parent,<br clear="none">>> +� � � � struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent,<br clear="none">>>� � � � � const struct wined3d_parent_ops **parent_ops)<br clear="none">>>� {<br clear="none">>> -� � TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",<br clear="none">>> -� � � � � � device_parent, container_parent, surface, parent, parent_ops);<br clear="none">>> +� �
TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n",<br clear="none">>> +� � � � � � device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops);<br clear="none">>><br clear="none">>>� � � *parent = NULL;<br clear="none">>>� � � *parent_ops = &d3d10_null_wined3d_parent_ops;<br clear="none">> This series looks fine, but there's a (trivial) merge conflict due to<br clear="none">> commit a865b14aedb01def345c09732717c3c5f2eb6dab.<br clear="none"><br clear="none"><br clear="none"></div></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>