From: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 43 ++++++++++---------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 1814b6e38ea..309ba6b2663 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -497,22 +497,19 @@ static void test_trig(void) return; ps_code = compile_shader(ps_source, "ps_4_0"); - if (ps_code) - { - draw_quad(&test_context, ps_code); - init_readback(&test_context, &rb); - - for (i = 0; i < 640; i += 20) - { - v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, sinf(i), cosf(i), 0.0f, 0.0f, 16384), - "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", - i, v->x, v->y, v->z, v->w, sinf(i), cos(i), 0.0f, 0.0f); - } + draw_quad(&test_context, ps_code); + init_readback(&test_context, &rb); - release_readback(&test_context, &rb); - ID3D10Blob_Release(ps_code); + for (i = 0; i < 640; i += 20) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, sinf(i), cosf(i), 0.0f, 0.0f, 16384), + "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + i, v->x, v->y, v->z, v->w, sinf(i), cos(i), 0.0f, 0.0f); } + + release_readback(&test_context, &rb); + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -617,16 +614,13 @@ static void test_sampling(void) ID3D11DeviceContext_ClearRenderTargetView(test_context.immediate_context, test_context.rtv, red); ps_code = compile_shader_flags(tests[i], "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); - if (ps_code) - { - draw_quad(&test_context, ps_code); + draw_quad(&test_context, ps_code); - v = get_color_vec4(&test_context, 0, 0); - ok(compare_vec4(&v, 0.25f, 0.0f, 0.25f, 0.0f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(&test_context, 0, 0); + ok(compare_vec4(&v, 0.25f, 0.0f, 0.25f, 0.0f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); winetest_pop_context(); } @@ -821,9 +815,6 @@ static void test_reflection(void) }; code = compile_shader(vs_source, "vs_5_0"); - 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); @@ -902,8 +893,6 @@ static void test_reflection(void) ok(!refcount, "Got unexpected refcount %lu.\n", refcount); 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6961