Rebase against 5e74b9ea945db50bd31cef3254865f6cd9544eb2

patches/d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch

@@ -1,38 +1,40 @@
-From 2c4ebd2e8f4cfdded1b93f26e74139e88ca94f78 Mon Sep 17 00:00:00 2001
+From bdc2d668649d5810b88bcdd842228f7d44d7a012 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 7 Jul 2017 05:44:09 +0200
-Subject: [PATCH 1/4] d3d11/tests: Add some basic depth tests.
+Subject: [PATCH] d3d11/tests: Add some basic depth tests.
 
 ---
- dlls/d3d11/tests/d3d11.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 206 insertions(+), 3 deletions(-)
+ dlls/d3d11/tests/d3d11.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 207 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index 5a36bc2..9d9d74b 100644
+index 8279e7b..5831bbc 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
-@@ -1458,8 +1458,9 @@ static void set_quad_color(struct d3d11_test_context *context, const struct vec4
+@@ -1476,10 +1476,11 @@ static void set_quad_color(struct d3d11_test_context *context, const struct vec4
              (ID3D11Resource *)context->ps_cb, 0, NULL, color, 0, 0);
  }
  
--#define draw_color_quad(context, color) draw_color_quad_(__LINE__, context, color)
--static void draw_color_quad_(unsigned int line, struct d3d11_test_context *context, const struct vec4 *color)
-+#define draw_color_quad(context, color) draw_color_quad_(__LINE__, context, color, 0.0)
-+#define draw_color_quad_z(context, color, z) draw_color_quad_(__LINE__, context, color, z)
-+static void draw_color_quad_(unsigned int line, struct d3d11_test_context *context, const struct vec4 *color, float z)
+-#define draw_color_quad(a, b) draw_color_quad_(__LINE__, a, b, NULL, 0)
+-#define draw_color_quad_vs(a, b, c, d) draw_color_quad_(__LINE__, a, b, c, d)
++#define draw_color_quad(a, b) draw_color_quad_(__LINE__, a, b, NULL, 0, 0.0)
++#define draw_color_quad_vs(a, b, c, d) draw_color_quad_(__LINE__, a, b, c, d, 0.0)
++#define draw_color_quad_z(context, color, z) draw_color_quad_(__LINE__, context, color, NULL, 0, z)
+ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *context,
+-        const struct vec4 *color, const DWORD *vs_code, size_t vs_code_size)
++        const struct vec4 *color, const DWORD *vs_code, size_t vs_code_size, float z)
  {
      static const DWORD ps_color_code[] =
      {
-@@ -1501,7 +1502,7 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte
- 
+@@ -1522,6 +1523,7 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte
      set_quad_color(context, color);
  
--    draw_quad_(line, context);
+     draw_quad_vs_(line, context, vs_code, vs_code_size);
 +    draw_quad_z_(line, context, z);
  }
  
  static void test_create_device(void)
-@@ -16776,6 +16777,207 @@ static void test_stencil_separate(void)
+@@ -17583,6 +17585,207 @@ static void test_stencil_separate(void)
      release_test_context(&test_context);
  }
  
@@ -240,7 +242,7 @@ index 5a36bc2..9d9d74b 100644
  static void test_uav_load(void)
  {
      struct shader
-@@ -25115,6 +25317,7 @@ START_TEST(d3d11)
+@@ -26490,6 +26693,7 @@ START_TEST(d3d11)
      test_shader_input_registers_limits();
      test_unbind_shader_resource_view();
      test_stencil_separate();
@@ -249,5 +251,5 @@ index 5a36bc2..9d9d74b 100644
      test_cs_uav_store();
      test_uav_store_immediate_constant();
 -- 
-2.7.4
+1.9.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e13f59085f8a3787abd4e3f3eabae1a7e607a3c0"
+	echo "5e74b9ea945db50bd31cef3254865f6cd9544eb2"
 }
 
 # Show version information
@@ -5199,6 +5199,9 @@ fi
 
 # Patchset ntdll-NtContinue
 # |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#31910] Add stub for NtContinue
+# |
 # | Modified files:
 # |   *	dlls/ntdll/exception.c, dlls/ntdll/ntdll.spec
 # |