[PATCH 4/4] d3dx9: Effect should preserve states regardless of state manager presence.
Paul Gofman
gofmanp at gmail.com
Tue Apr 4 05:15:25 CDT 2017
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
dlls/d3dx9_36/effect.c | 9 +++++++--
dlls/d3dx9_36/tests/effect.c | 1 -
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 10f603c..577344c 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3789,7 +3789,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW
if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE))
WARN("Invalid flags (%#x) specified.\n", flags);
- if (effect->manager || flags & D3DXFX_DONOTSAVESTATE)
+ if (flags & D3DXFX_DONOTSAVESTATE)
{
TRACE("State capturing disabled.\n");
}
@@ -3800,12 +3800,17 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW
if (!technique->saved_state)
{
+ ID3DXEffectStateManager *manager;
+
+ manager = effect->manager;
+ effect->manager = NULL;
if (FAILED(hr = IDirect3DDevice9_BeginStateBlock(effect->device)))
ERR("BeginStateBlock failed, hr %#x.\n", hr);
for (i = 0; i < technique->pass_count; i++)
d3dx9_apply_pass_states(effect, &technique->passes[i], TRUE);
if (FAILED(hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state)))
ERR("EndStateBlock failed, hr %#x.\n", hr);
+ effect->manager = manager;
}
if (FAILED(hr = IDirect3DStateBlock9_Capture(technique->saved_state)))
ERR("StateBlock Capture failed, hr %#x.\n", hr);
@@ -3884,7 +3889,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface)
if (!effect->started)
return D3D_OK;
- if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE)
+ if (effect->flags & D3DXFX_DONOTSAVESTATE)
{
TRACE("State restoring disabled.\n");
}
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 668c9f7..058b19e 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -5697,7 +5697,6 @@ static void test_effect_state_manager(IDirect3DDevice9 *device)
hr = IDirect3DDevice9_GetLight(device, i, &light);
ok(hr == D3D_OK, "Got result %#x.\n", hr);
- todo_wine
ok(!memcmp(&light, &light_filler, sizeof(light)), "Light %u mismatch.\n", i);
}
--
2.9.3
More information about the wine-patches
mailing list