Paul Gofman : d3dx9: Implement CommitChanges in effect.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: afcb6dc891cb44049e0295207b9bdd64994a1fef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=afcb6dc891cb44049e0295207b...

Author: Paul Gofman 
Date:   Thu Mar  3 15:22:15 2016 +0300

d3dx9: Implement CommitChanges in effect.

Signed-off-by: Paul Gofman 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index ca5c46b..4be6e4b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3556,19 +3556,19 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass)
     return D3DERR_INVALIDCALL;
 }

-static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface)
+static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface)
 {
-    struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
+    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);

-    FIXME("(%p)->(): stub\n", This);
+    TRACE("iface %p.\n", iface);

-    if (!This->active_pass)
+    if (!effect->active_pass)
     {
         WARN("Called without an active pass.\n");
         return D3D_OK;
     }
-
-    return E_NOTIMPL;
+    /* TODO: apply only changed states */
+    return d3dx9_apply_pass_states(effect, effect->active_pass);
 }

static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface)