Module: wine Branch: master Commit: b8807b994f9df0febf5fc22f0e71fae92181d79e URL: https://gitlab.winehq.org/wine/wine/-/commit/b8807b994f9df0febf5fc22f0e71fae...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Mar 25 10:46:13 2023 +0100
d3dcompiler/tests: Update todos for tests that succeed with vkd3d 1.7.
---
dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 9 ++++++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 3e6f3614986..ac0cf20e5ee 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -492,7 +492,7 @@ static void test_trig(void) if (!init_test_context(&test_context)) return;
- todo_wine ps_code = compile_shader(ps_source, "ps_4_0"); + ps_code = compile_shader(ps_source, "ps_4_0"); if (ps_code) { draw_quad(&test_context, ps_code); @@ -817,7 +817,7 @@ static void test_reflection(void) {"a", D3D_SIT_TEXTURE, 3, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, };
- todo_wine code = compile_shader(vs_source, "vs_5_0"); + code = compile_shader(vs_source, "vs_5_0"); if (!code) return;
@@ -898,7 +898,10 @@ static void test_reflection(void) refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %lu.\n", refcount);
+ todo_wine code = compile_shader_flags(ps_source, "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + if (!code) + return; hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -1123,7 +1126,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Test %u", i);
- todo_wine_if (i > 5) code = compile_shader_flags(tests[i].source, tests[i].target, + todo_wine_if (i > 6) code = compile_shader_flags(tests[i].source, tests[i].target, tests[i].legacy ? D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY : 0); if (!code) { diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b52b840f3bf..4fef301a721 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -691,7 +691,7 @@ static void test_trig(void) return; device = test_context.device;
- todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + ps_code = compile_shader(ps_source, "ps_2_0"); if (ps_code) { draw_quad(device, ps_code); @@ -702,6 +702,7 @@ static void test_trig(void) float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; v = get_readback_vec4(&rb, i * 640 / 32, 0); + todo_wine ok(compare_vec4(v, expect_x, expect_y, 0.0f, 0.0f, 4096), "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", i, v->x, v->y, v->z, v->w, expect_x, expect_y, 0.0f, 0.0f); @@ -767,7 +768,7 @@ static void test_return(void) draw_quad(test_context.device, ps_code);
v = get_color_vec4(test_context.device, 0, 0); - todo_wine ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w);
ID3D10Blob_Release(ps_code); @@ -1102,7 +1103,7 @@ static void test_samplers(void) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); - todo_wine_if (i < 3) ps_code = compile_shader(tests[i], "ps_2_0"); + ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { draw_quad(test_context.device, ps_code);