d3dx9: Fix IsParameterUsed() for the case when state references child parameter.

Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Fix IsParameterUsed() for the case when state references child parameter.
1bd3cc24 · Paul Gofman · Alexandre Julliard · 2be74048 · 1bd3cc24 · 1bd3cc24
Commit 1bd3cc24 authored Apr 24, 2017 by Paul Gofman Committed by Alexandre Julliard Apr 25, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

effect.c dlls/d3dx9_36/effect.c +1 -0

effect.c dlls/d3dx9_36/tests/effect.c +1 -3

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3728,6 +3728,7 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_
    unsigned int i;
    unsigned int member_count;

+    param = param->top_level_param;
    if (param_func(data, param))
        return TRUE;


--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -5949,16 +5949,14 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device)

    param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2");
    ok(!!param, "GetParameterByName failed.\n");
+    todo_wine
    ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"),
            "Unexpected IsParameterUsed result.\n");

-    todo_wine
    ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"),
            "Unexpected IsParameterUsed result.\n");
-    todo_wine
    ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"),
            "Unexpected IsParameterUsed result.\n");
-    todo_wine
    ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"),
            "Unexpected IsParameterUsed result.\n");