Rebase against 981dec4986e7ac1982049dbede1ca2aa72f5e70c.

This commit is contained in:
Sebastian Lackner
2017-10-27 19:40:52 +02:00
parent e3089157b4
commit a8a83ab795
11 changed files with 90 additions and 154 deletions

View File

@@ -1,27 +0,0 @@
From 623008778ae6b9ebe5903d71f1e09abefca7ae65 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 18 Feb 2017 21:50:33 +0100
Subject: d3d11/tests: Avoid test failures.
---
dlls/d3d11/tests/d3d11.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 8f37304b5e..64df74f671 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -14609,8 +14609,10 @@ static void test_unaligned_raw_buffer_access(const D3D_FEATURE_LEVEL feature_lev
ID3D11DeviceContext_Dispatch(context, 1, 1, 1);
get_buffer_readback(raw_buffer, &rb);
data = get_readback_color(&rb, 0, 0);
+ todo_wine
ok(data == 0xffff, "Got unexpected result %#x.\n", data);
data = get_readback_color(&rb, 1, 0);
+ todo_wine
ok(data == 0xa, "Got unexpected result %#x.\n", data);
release_resource_readback(&rb);
--
2.11.0