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,4 +1,4 @@
From 36521fb8d471b34993598a6e83b873d2d887e9ed Mon Sep 17 00:00:00 2001
From 11060b421e2879d9307be95cba69117d6adf69aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 Sep 2017 05:13:04 +0200
Subject: d3d11/tests: Add basic test for mipmap level generation.
@@ -8,10 +8,10 @@ Subject: d3d11/tests: Add basic test for mipmap level generation.
1 file changed, 111 insertions(+)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index f6bb69e834b..154771f4240 100644
index 3c8ff15d6eb..0dc1c94d883 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -22646,6 +22646,116 @@ static void test_interpolation(void)
@@ -22062,6 +22062,116 @@ static void test_dual_blending(void)
release_test_context(&test_context);
}
@@ -128,12 +128,12 @@ index f6bb69e834b..154771f4240 100644
START_TEST(d3d11)
{
test_create_device();
@@ -22752,4 +22862,5 @@ START_TEST(d3d11)
@@ -22167,4 +22277,5 @@ START_TEST(d3d11)
test_early_depth_stencil();
test_conservative_depth_output();
test_dual_blending();
test_interpolation();
+ test_mipmap_generation();
}
--
2.14.1
2.14.2

View File

@@ -1,3 +1,3 @@
Fixes: Support for GenerateMips
Depends: wined3d-Interpolation_Modifiers
Depends: wined3d-Copy_Resource_Typeless
Depends: wined3d-Dual_Source_Blending