Re: [PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm)

Am 08.03.2011 um 19:41 schrieb Henri Verbeet:
> ---
> dlls/d3d9/device.c |    3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
> index 1dd6895..e008b31 100644
> --- a/dlls/d3d9/device.c
> +++ b/dlls/d3d9/device.c
> @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface,
>
> /* This method is only allowed with surfaces that are render targets, or
>      * offscreen plain surfaces in D3DPOOL_DEFAULT. */
> -    if (!(desc.usage & WINED3DUSAGE_RENDERTARGET)
> -            && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE))
> +    if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT)
>     {
>         wined3d_mutex_unlock();
>         WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");
> -- 
> 1.7.3.4

-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)

iQIcBAEBAgAGBQJNdrJeAAoJEN0/YqbEcdMwx3kP/0FGwYvZM7+YUz1atAfcpTQH
mFsaWRKCMac9FHWHsoK++HyeN0R0F69NMnJzH33u2xxhrM6DvPfHsDrP0kcySHDN
3sVP/87U1cdHaVmURjnx6o0+3elj/IikmM0rGkTT3eityItp5hgj+OiizuD+wwQ5
jxrcsvI1tS4iZe+j+2s8zt1zJYhGNhJRI5n8IFCpPP3MXFqDPxxiUwua7MRweWx3
MRZQVkmJ4/3Jy5rTKjf4LROBqY2ZLP8Yeyo0jgAS3Wn+1LEJqKtgEhz03/rxGNPQ
Lwpx+1gLsl2XonbZMPUXfhoE4ETi70S7OC2Z3EVOBY+XbEPRdEq6qIsoAQwFfHFQ
AVo8qjSndjcd9sxQ4MQyarxHfRuL9OlCnO+WKfMOHo1WFdBg7I8uPrYKuZmlDZ2c
lEwSOgh2Td0PCs0Gha0uqt8Gav5t1M40zKoGE2Lmd8gKAu4+Ot1IwbhU0tebaKMC
JUD0d83oNgxbPsoKUdbbnq4oeDBMNnnFKQ18m9H7N1LABe9hzE13IfcxCfVLWfzk
CtJlYWBeqa5hD5Chf1eNMuZEHyooaRhgy6Q0Vd5DVVpTMj9JzURIo7Mnb43GG9QT
H7EkmVR2Ivn8ZHzF7nqeAJxqcWQKPmpn5/RTqapPbVx5mN7CYIICj5pvkJi8A0Zs
Qvn8oiJ+qivoIPKlIyTP
=Pm4w
-----END PGP SIGNATURE-----

[PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

[Henri Verbeet]

On 8 March 2011 23:48, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote:
> Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm)

It's not working very well then, surfaces really do always have
D3DRTYPE_SURFACE as resource type in Wine. Note that returning
D3DRTYPE_TEXTURE for surfaces that are part of a texture would also
imply that you can't distinguish between a surface and a texture
IDirect3DResource9 pointer without doing QueryInterface() calls.