Matteo Bruni : d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
Alexandre Julliard
julliard at winehq.org
Mon Mar 28 15:53:41 CDT 2022
Module: wine
Branch: master
Commit: f26fa0465626561bc531dfda32a9e90e9d52c3cd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26fa0465626561bc531dfda32a9e90e9d52c3cd
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Mon Mar 28 14:12:16 2022 +0200
d3dx11/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx11_43/tests/d3dx11.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c
index 357a84ce457..47451e7fff2 100644
--- a/dlls/d3dx11_43/tests/d3dx11.c
+++ b/dlls/d3dx11_43/tests/d3dx11.c
@@ -577,7 +577,12 @@ static void test_D3DX11CompileFromFile(void)
"main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
- ok(!errors, "Got unexpected errors.\n");
+ todo_wine ok(!errors, "Got unexpected errors.\n");
+ if (errors)
+ {
+ ID3D10Blob_Release(errors);
+ errors = NULL;
+ }
if (blob)
{
ID3D10Blob_Release(blob);
@@ -590,7 +595,12 @@ static void test_D3DX11CompileFromFile(void)
hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
- ok(!errors, "Got unexpected errors.\n");
+ todo_wine ok(!errors, "Got unexpected errors.\n");
+ if (errors)
+ {
+ ID3D10Blob_Release(errors);
+ errors = NULL;
+ }
if (blob)
{
ID3D10Blob_Release(blob);
@@ -602,7 +612,12 @@ static void test_D3DX11CompileFromFile(void)
hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
- ok(!errors, "Got unexpected errors.\n");
+ todo_wine ok(!errors, "Got unexpected errors.\n");
+ if (errors)
+ {
+ ID3D10Blob_Release(errors);
+ errors = NULL;
+ }
if (blob)
{
ID3D10Blob_Release(blob);
@@ -615,7 +630,12 @@ static void test_D3DX11CompileFromFile(void)
hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
- ok(!errors, "Got unexpected errors.\n");
+ todo_wine ok(!errors, "Got unexpected errors.\n");
+ if (errors)
+ {
+ ID3D10Blob_Release(errors);
+ errors = NULL;
+ }
if (blob)
{
ID3D10Blob_Release(blob);
More information about the wine-cvs
mailing list