d3dx9: Implement ID3DXEffect::EndPass().

bc59705a · Rico Schüller · Alexandre Julliard · b7919e65 · bc59705a
Commit bc59705a authored Jun 27, 2011 by Rico Schüller Committed by Alexandre Julliard Jun 27, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

effect.c dlls/d3dx9_36/effect.c +11 -3

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2873,13 +2873,21 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface)
    return E_NOTIMPL;
 }

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

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

-    return E_NOTIMPL;
+    if (This->active_pass)
+    {
+         This->active_pass = NULL;
+         return D3D_OK;
+    }
+
+    WARN("Invalid call.\n");
+
+    return D3DERR_INVALIDCALL;
 }

 static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface)