[PATCH v2 4/5] d3d9: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock().
Mathew Hodson
mathew.hodson at gmail.com
Tue Nov 26 18:25:05 CST 2019
On Tue, Nov 26, 2019 at 10:58 AM Zebediah Figura <z.figura12 at gmail.com> wrote:
>
> Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
> ---
> dlls/d3d9/device.c | 17 ++++++++++++-----
> dlls/d3d9/tests/device.c | 7 -------
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
> index 76fddc59f18..0657cc2f766 100644
> --- a/dlls/d3d9/device.c
> +++ b/dlls/d3d9/device.c
> @@ -2400,7 +2400,14 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface)
> TRACE("iface %p.\n", iface);
>
> wined3d_mutex_lock();
> - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock)))
> + if (device->recording)
> + {
> + wined3d_mutex_unlock();
> + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n");
> + return D3DERR_INVALIDCALL;
Was there a copy paste mistake here? The warning message doesn't match
the return value.
More information about the wine-devel
mailing list