=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d10core/tests: Initialize texture data in test_copy_subresource_region().

Alexandre Julliard julliard at winehq.org
Wed Nov 9 13:47:02 CST 2016


Module: wine
Branch: master
Commit: a55c56ee29fccc8e61a0c0cd62eb0414607b1567
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a55c56ee29fccc8e61a0c0cd62eb0414607b1567

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed Nov  9 12:35:26 2016 +0100

d3d10core/tests: Initialize texture data in test_copy_subresource_region().

Fixes test failures on Intel GPUs.

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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 3bd6ea6..fbce77d 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -6727,6 +6727,7 @@ static void test_copy_subresource_region(void)
         0x0010000a, 0x00000000, 0x0100003e,
     };
     static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f};
+    static const DWORD initial_data[16] = {0};
     static const DWORD bitmap_data[] =
     {
         0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00,
@@ -6759,13 +6760,17 @@ static void test_copy_subresource_region(void)
     texture_desc.CPUAccessFlags = 0;
     texture_desc.MiscFlags = 0;
 
-    hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture);
+    resource_data.pSysMem = initial_data;
+    resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data);
+    resource_data.SysMemSlicePitch = 0;
+
+    hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture);
     ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr);
 
     texture_desc.Usage = D3D10_USAGE_IMMUTABLE;
 
     resource_data.pSysMem = bitmap_data;
-    resource_data.SysMemPitch = 4 * sizeof(*bitmap_data);
+    resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data);
     resource_data.SysMemSlicePitch = 0;
 
     hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture);




More information about the wine-cvs mailing list