Rebase against 868fb05e7710dbaa94569fa7d2c3736580aec438

This commit is contained in:
Alistair Leslie-Hughes 2018-06-08 08:21:29 +10:00
parent 6b93eac6ad
commit f98bff1805
2 changed files with 7 additions and 7 deletions

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "5fd3090f522a9c2a4cfb077c9b7cdc1ae1304c4c"
echo "868fb05e7710dbaa94569fa7d2c3736580aec438"
}
# Show version information

View File

@ -1,4 +1,4 @@
From e5a957d77afa0539b75ba4819d1682a4f5749219 Mon Sep 17 00:00:00 2001
From 55ee7e5738f4cb166b806a06a4e2b46bc5cebb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 18 Aug 2017 23:22:16 +0200
Subject: [PATCH] d3d11/tests: Add basic dual source blend test.
@ -8,10 +8,10 @@ Subject: [PATCH] d3d11/tests: Add basic dual source blend test.
1 file changed, 169 insertions(+)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 8ca6634..242a003 100644
index c24287d..083ffe9 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -26553,6 +26553,174 @@ static void test_multisample_resolve(void)
@@ -27603,6 +27603,174 @@ static void test_depth_clip(void)
release_test_context(&test_context);
}
@ -186,8 +186,8 @@ index 8ca6634..242a003 100644
START_TEST(d3d11)
{
unsigned int argc, i;
@@ -26682,6 +26850,7 @@ START_TEST(d3d11)
test_fractional_viewports();
@@ -27735,6 +27903,7 @@ START_TEST(d3d11)
run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports);
test_early_depth_stencil();
test_conservative_depth_output();
+ test_dual_blending();
@ -195,5 +195,5 @@ index 8ca6634..242a003 100644
test_clip_distance();
test_combined_clip_and_cull_distances();
--
2.7.4
1.9.1