[PATCH 3/4] d2d1/tests: Add version independent resource_readback members.

Henri Verbeet hverbeet at gmail.com
Mon Jan 11 11:03:05 CST 2021


On Thu, 7 Jan 2021 at 20:44, Rémi Bernon <rbernon at codeweavers.com> wrote:
> diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
> index 78a16a90252..43155bfb79a 100644
> --- a/dlls/d2d1/tests/d2d1.c
> +++ b/dlls/d2d1/tests/d2d1.c
> @@ -43,7 +43,8 @@ struct resource_readback
>  {
>      ID3D10Resource *resource;
>      D3D10_MAPPED_TEXTURE2D map_desc;
> -    unsigned int width, height;
> +    unsigned int pitch, width, height;
> +    void *data;
>  };
>
>  struct figure
> @@ -336,6 +337,9 @@ static void get_surface_readback(IDXGISurface *surface, struct resource_readback
>
>      hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc);
>      ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr);
> +
> +    rb->pitch = rb->map_desc.RowPitch;
> +    rb->data = rb->map_desc.pData;
>  }
>
The "map_desc" field in struct resource_readback should be superfluous
now, right?



More information about the wine-devel mailing list