Module: wine Branch: master Commit: e7cf04be520c76ef4ad10a516fe2ba6dd0d4a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cf04be520c76ef4ad10a516f...
Author: Józef Kucia jkucia@codeweavers.com Date: Fri Jun 9 13:00:01 2017 +0200
d3d11/tests: Fix ok() checks in test_timestamp_query().
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d11/tests/d3d11.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a3f2c98..5565143 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5021,7 +5021,7 @@ static void test_timestamp_query(void)
ID3D11DeviceContext_End(context, timestamp_disjoint_query); get_query_data(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint)); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != ~(UINT64)0, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint);
prev_disjoint = disjoint; @@ -5044,7 +5044,8 @@ static void test_timestamp_query(void) hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + ok(disjoint.Frequency == prev_disjoint.Frequency, "Frequency data mismatch.\n"); + ok(disjoint.Disjoint == prev_disjoint.Disjoint, "Disjoint data mismatch.\n");
memset(×tamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); @@ -5092,7 +5093,7 @@ static void test_timestamp_query(void) disjoint.Disjoint = 0xff; hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint);
/* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */