Matteo Bruni : d3dx9/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: 8956862e0a7fec92a983a455ea902a61f83d28da
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8956862e0a7fec92a983a455ea902a61f83d28da

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Mon Mar 28 14:12:17 2022 +0200

d3dx9/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52721
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 285bca1cdae..12af35cb8d8 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -8105,7 +8105,7 @@ static void test_create_effect_from_file(void)
     /* This is apparently broken on native, it ends up using the wrong include. */
     hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL,
             0, NULL, &effect, &messages);
-    todo_wine ok(hr == E_FAIL, "Unexpected error, hr %#x.\n", hr);
+    ok(hr == E_FAIL, "Unexpected error, hr %#x.\n", hr);
     if (messages)
     {
         trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));
@@ -8130,7 +8130,7 @@ static void test_create_effect_from_file(void)
      * is "ID3DXEffectCompiler: There were no techniques" */
     hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, &include.ID3DXInclude_iface, NULL,
             0, NULL, &effect, &messages);
-    todo_wine ok(hr == E_FAIL, "D3DXInclude test failed with error %#x.\n", hr);
+    ok(hr == E_FAIL, "D3DXInclude test failed with error %#x.\n", hr);
     if (messages)
     {
         trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages));




More information about the wine-cvs mailing list