Nikolay Sivov : d3d10/tests: Use IsValid() instead of null checks.
Alexandre Julliard
julliard at winehq.org
Fri Oct 15 15:40:06 CDT 2021
Module: wine
Branch: master
Commit: 7c7a14bfc2d13b2cc2049c861e4be66d8259720b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7a14bfc2d13b2cc2049c861e4be66d8259720b
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Oct 14 09:42:23 2021 +0300
d3d10/tests: Use IsValid() instead of null checks.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d10/tests/effect.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c
index 76beb682fea..bd5392fcd16 100644
--- a/dlls/d3d10/tests/effect.c
+++ b/dlls/d3d10/tests/effect.c
@@ -4499,9 +4499,9 @@ static void test_effect_state_groups(void)
rast_desc.AntialiasedLineEnable);
technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0");
- ok(!!technique, "Failed to get technique.\n");
+ ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");
pass = technique->lpVtbl->GetPassByName(technique, "pass0");
- ok(!!pass, "Failed to get pass.\n");
+ ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n");
hr = pass->lpVtbl->GetDesc(pass, &pass_desc);
ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr);
ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name);
@@ -4789,9 +4789,9 @@ static void test_effect_state_group_defaults(void)
rast_desc.AntialiasedLineEnable);
technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0");
- ok(!!technique, "Failed to get technique.\n");
+ ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");
pass = technique->lpVtbl->GetPassByName(technique, "pass0");
- ok(!!pass, "Failed to get pass.\n");
+ ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n");
hr = pass->lpVtbl->GetDesc(pass, &pass_desc);
ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr);
ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name);
@@ -6155,9 +6155,9 @@ static void test_effect_resource_variable(void)
/* Apply the pass to bind the resource to the shader. */
technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test");
- ok(!!technique, "Got unexpected technique %p.\n", technique);
+ ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");
pass = technique->lpVtbl->GetPassByName(technique, "p0");
- ok(!!pass, "Got unexpected pass %p.\n", pass);
+ ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n");
hr = pass->lpVtbl->GetDesc(pass, &pass_desc);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n");
@@ -6227,9 +6227,9 @@ static void test_effect_resource_variable(void)
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test");
- ok(!!technique, "Got unexpected technique %p.\n", technique);
+ ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");
pass = technique->lpVtbl->GetPassByName(technique, "p0");
- ok(!!pass, "Got unexpected pass %p.\n", pass);
+ ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n");
var = effect->lpVtbl->GetVariableByName(effect, "s");
ok(var->lpVtbl->IsValid(var), "Expected valid variable.\n");
More information about the wine-cvs
mailing list