Matteo Bruni : d3dx9: Implement FindNextValidTechnique().

Alexandre Julliard julliard at winehq.org
Tue Jun 26 04:44:26 CDT 2018


Module: wine
Branch: stable
Commit: 4175d27291c00e54b462824a229526fb3b28d4c3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4175d27291c00e54b462824a229526fb3b28d4c3

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Thu Mar 22 21:43:06 2018 +0100

d3dx9: Implement FindNextValidTechnique().

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit c3342644e418358e63273580f46cce2d05de9e35)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/d3dx9_36/effect.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index bd1a9e1..22ba691 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3984,13 +3984,45 @@ done:
     return ret;
 }
 
-static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique)
+static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface,
+        D3DXHANDLE technique, D3DXHANDLE *next_technique)
 {
-    struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
+    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx9_base_effect *base = &effect->base_effect;
+    struct d3dx_technique *prev_tech, *tech;
+    unsigned int i;
 
-    FIXME("(%p)->(%p, %p): stub\n", This, technique, next_technique);
+    TRACE("iface %p, technique %p, next_technique %p.\n", iface, technique, next_technique);
 
-    return E_NOTIMPL;
+    if (technique)
+    {
+        if (!(prev_tech = get_valid_technique(base, technique)))
+            return D3DERR_INVALIDCALL;
+
+        for (i = 0; i < base->technique_count; ++i)
+        {
+            tech = &base->techniques[i];
+            if (tech == prev_tech)
+                break;
+        }
+    }
+    else
+    {
+        i = 0;
+    }
+
+    for (++i; i < base->technique_count; ++i)
+    {
+        tech = &base->techniques[i];
+        if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech))))
+        {
+            *next_technique = get_technique_handle(tech);
+            return D3D_OK;
+        }
+    }
+
+    *next_technique = get_technique_handle(&base->techniques[0]);
+    return S_FALSE;
 }
 
 static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,




More information about the wine-cvs mailing list