Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetTexture() helper.

Alexandre Julliard julliard at winehq.org
Thu Mar 14 18:33:22 CDT 2019


Module: wine
Branch: master
Commit: f06d6ab0858db398576e36bf295be581952d6209
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f06d6ab0858db398576e36bf295be581952d6209

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Mar 13 00:10:56 2019 +0100

d3dx9: Merge the d3dx_effect_GetTexture() helper.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 155a499..0b7f89d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1528,27 +1528,6 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base,
     return D3DERR_INVALIDCALL;
 }
 
-static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    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 = *(struct IDirect3DBaseTexture9 **)param->data;
-        if (*texture) IDirect3DBaseTexture9_AddRef(*texture);
-        TRACE("Returning %p\n", *texture);
-        return D3D_OK;
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader)
 {
@@ -3563,14 +3542,29 @@ static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHAND
     return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture);
 }
 
-static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter,
-        struct IDirect3DBaseTexture9 **texture)
+static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter,
+        IDirect3DBaseTexture9 **texture)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
 
     TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture);
 
-    return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture);
+    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 = *(IDirect3DBaseTexture9 **)param->data;
+        if (*texture)
+            IDirect3DBaseTexture9_AddRef(*texture);
+        TRACE("Returning %p.\n", *texture);
+        return D3D_OK;
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter,




More information about the wine-cvs mailing list