[resend 2/5] ddraw: check for mipmap sublevel through caps in ddraw_surface7_SetColorKey

Stefan Dösinger stefandoesinger at gmail.com
Thu Nov 5 06:38:05 CST 2015


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato:
> -    wined3d_mutex_lock();
> -    if (!surface->wined3d_texture)
> -    {
> -        wined3d_mutex_unlock();
> +    if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
>          return DDERR_NOTONMIPMAPSUBLEVEL;
> -    }
> -    wined3d_mutex_unlock();
This is OK, but an fyi: The wined3d lock is also used to protect ddraw
data (something we may want to change in the future).
DDSCAPS2_MIPMAPSUBLEVEL is not changable after creation (via
SetSurfaceDesc), so I don't think we need to worry about the lock here.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWO02tAAoJEN0/YqbEcdMwlmsP/297KNeM9NoJ6C6cljdOi3us
GixMSJeTHwOmz0xVsu8fHVOpetiKWmn7h0qVn5aGoZNgs6vIHd+f2F+gf5EIlkA0
LxHQWwZUnulbW+unUIh/mj+Z7exjtWn1vn1jFjGyRB+9QgqxiZ9Nm6cz3z5tbtIc
+1q5M/VYabvwzEGojV+ZK8cRnFnt3UsFTysxL94s1fz+Mn4IMTXfPejwF/PbylEV
QPWOqg8LF+OKULdZw8oxn3APjQ+CFHvTCsCRbaB9wpeVRb4SEaIWyjopXxBQA9F8
WF1WrxmgkHA+WGWhItdxHkJYBbYFyDU7Vy5Up0Z9i0cLOwUT6EtQGyWuojeGkoTk
bJah077nAMf6Ua5yqrT/Dl+bPUWovPZQ60umZdnNul4HKCuyJeHvALkZharXYJU4
3P4YYlIzWPqRdk7csaehr1DPkKcQZvKRhdaGkYhzg+NKM89ztgNALeTNs08GmzHP
Ta+w8OfSRZM1lwmwT/0Tk8NggMrFe6qX1w7Fu6I3cvcaa5H6e2xhFyXKGWFbUCBQ
ieJ5Z0VKuO0WqOiWF2hPsrHqerLDMKCpR9pCCp5B9ciU9qZcmfGT/XKa5U01kah1
qEJ84ejVkM5bwnhbrS8BhmepVC9K7c7/bG/z25ayizU8foKukRNtS+Pz3DGA6OzF
nfQeq4wZ/zAush2o+2oJ
=aXfg
-----END PGP SIGNATURE-----



More information about the wine-devel mailing list