Re: wined3d: Consolidate all existing enablings of SFLAG_INSYSMEM in surface.c into one easy line

[Stefan Dösinger]

Am Freitag 13 April 2007 00:28 schrieb Phil Costin:
> This patch removes the need to manually set SFLAG_INSYSMEM after a call to
> surface_download_data. It should be set by the function.

-        /* Mark the local copy up to date if a full download was done */
-        if(This->lockedRect.left == 0 &&
-           This->lockedRect.top == 0 &&
-           This->lockedRect.right == This->currentDesc.Width &&
-           This->lockedRect.bottom == This->currentDesc.Height) {
-            This->Flags |= SFLAG_INSYSMEM;
-        }

This is not correct. This path is for render target locking, and it does not 
call surface_download_data, so you can't remove that.

wined3d: Consolidate all existing enablings of SFLAG_INSYSMEM in surface.c into one easy line

[Phil Costin]

Stefan Dösinger wrote:
> On Friday 13 April 2007 00:28 Phil Costin wrote:
> > This patch removes the need to manually set SFLAG_INSYSMEM after a call
> > to surface_download_data. It should be set by the function.
> -
>    /* Mark the local copy up to date if a full download was done */
> -
>    if(This->lockedRect.left == 0 &&
> -
>       This->lockedRect.top == 0 &&
> -
>       This->lockedRect.right == This->currentDesc.Width &&
> -
>       This->lockedRect.bottom == This->currentDesc.Height) {
> -
>        This->Flags |= SFLAG_INSYSMEM;
> -
>    }
>
> This is not correct. This path is for render target locking, and it does
> not call surface_download_data, so you can't remove that.

Aha, thanks.. I see what I did there.

Here's the modified version.

Phil.