=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d10core/tests: Print expected result in case of failures in check_texture_sub_resource_* () functions.
Alexandre Julliard
julliard at winehq.org
Thu Dec 8 17:15:47 CST 2016
Module: wine
Branch: master
Commit: 1e7b52c5c1e070995798372c0efdc919f5e53f51
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7b52c5c1e070995798372c0efdc919f5e53f51
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Dec 7 12:57:52 2016 +0100
d3d10core/tests: Print expected result in case of failures in check_texture_sub_resource_*() functions.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d10core/tests/device.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 778f33c..784a086 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -643,8 +643,8 @@ static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D
}
release_resource_readback(&rb);
ok_(__FILE__, line)(all_match,
- "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n",
- color, x, y, sub_resource_idx);
+ "Got 0x%08x, expected 0x%08x at (%u, %u), sub-resource %u.\n",
+ color, expected_color, x, y, sub_resource_idx);
}
#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d)
@@ -686,8 +686,8 @@ static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D
}
release_resource_readback(&rb);
ok_(__FILE__, line)(all_match,
- "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n",
- value, x, y, sub_resource_idx);
+ "Got %.8e, expected %.8e at (%u, %u), sub-resource %u.\n",
+ value, expected_value, x, y, sub_resource_idx);
}
#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d)
@@ -729,8 +729,10 @@ static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D
}
release_resource_readback(&rb);
ok_(__FILE__, line)(all_match,
- "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n",
- value.x, value.y, value.z, value.w, x, y, sub_resource_idx);
+ "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n",
+ value.x, value.y, value.z, value.w,
+ expected_value->x, expected_value->y, expected_value->z, expected_value->w,
+ x, y, sub_resource_idx);
}
#define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c)
More information about the wine-cvs
mailing list