Commit 3e87746e authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

d3d9: Forbid capturing a stateblock while recording.

parent 3fcec2b7
...@@ -96,10 +96,18 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi ...@@ -96,10 +96,18 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi
static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface)
{ {
struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface);
struct d3d9_device *device;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); wined3d_mutex_lock();
device = impl_from_IDirect3DDevice9Ex(stateblock->parent_device);
if (device->recording)
{
wined3d_mutex_unlock();
WARN("Trying to capture stateblock while recording, returning D3DERR_INVALIDCALL.\n");
return D3DERR_INVALIDCALL;
}
wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_stateblock_capture(stateblock->wined3d_stateblock);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
......
...@@ -10599,7 +10599,7 @@ static void test_begin_end_state_block(void) ...@@ -10599,7 +10599,7 @@ static void test_begin_end_state_block(void)
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DStateBlock9_Capture(stateblock); hr = IDirect3DStateBlock9_Capture(stateblock);
todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2);
todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment