Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTexture().

Alexandre Julliard julliard at winehq.org
Fri May 13 11:17:53 CDT 2011


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

Author: Rico Schüller <kgbricola at web.de>
Date:   Fri May 13 11:35:37 2011 +0200

d3dx9: Implement ID3DXBaseEffect::GetTexture().

---

 dlls/d3dx9_36/effect.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index ee0a5ab..4332386 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1569,10 +1569,24 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3D
 static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 *texture)
 {
     struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+    struct d3dx_parameter *param = is_valid_parameter(This, parameter);
 
-    FIXME("iface %p, parameter %p, texture %p stub\n", This, parameter, texture);
+    TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture);
 
-    return E_NOTIMPL;
+    if (texture && param && !param->element_count &&
+            (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D
+            || param->type == D3DXPT_TEXTURE2D || param->type ==  D3DXPT_TEXTURE3D
+            || param->type == D3DXPT_TEXTURECUBE))
+    {
+        *texture = *(LPDIRECT3DBASETEXTURE9 *)param->data;
+        if (*texture) IDirect3DBaseTexture9_AddRef(*texture);
+        TRACE("Returning %p\n", *texture);
+        return D3D_OK;
+    }
+
+    WARN("Invalid argument specified\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 *pshader)




More information about the wine-cvs mailing list