[PATCH 1/5] d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
Zebediah Figura (she/her)
zfigura at codeweavers.com
Wed Oct 6 09:30:38 CDT 2021
On 10/6/21 08:53, Matteo Bruni wrote:
> Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
> ---
> For reference, I got this "new" result with a d3dcompiler_46.dll found
> in Steam's directory.
>
> dlls/d3dcompiler_43/tests/reflection.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c
> index 75f30e45dce..8cf6edb1c97 100644
> --- a/dlls/d3dcompiler_43/tests/reflection.c
> +++ b/dlls/d3dcompiler_43/tests/reflection.c
> @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void)
>
> expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK;
> hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12);
> - /* Broken with older d3dcompiler_47. */
> - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr);
> + /* Broken with older d3dcompiler_46, d3dcompiler_47. */
> + ok(hr == expected_hr || broken(expected_hr != E_NOINTERFACE && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr);
I guess this condition could be simplified to (hr == expected_hr ||
broken(hr == E_NOINTERFACE)), right?
>
> if (hr != S_OK)
> return;
>
More information about the wine-devel
mailing list