Rebase against 21ae9ba1ba8ddba3ba49e916ef2b7fbd5ae9713d

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "61aea5a9879f41224022d4775cce28d28618ea89"
+	echo "21ae9ba1ba8ddba3ba49e916ef2b7fbd5ae9713d"
 }
 
 # Show version information

patches/setupapi-SP_COPY_IN_USE_NEEDS_REBOOT/0001-setupapi-Implement-SP_COPY_IN_USE_NEEDS_REBOOT.patch

@@ -1,17 +1,17 @@
-From 9d2e0955b8f2b4e4e73a929757f0b34cd03d3439 Mon Sep 17 00:00:00 2001
+From be3b930fc9abcd8d1038542dc47a1d52bf8500dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 18 Sep 2016 22:59:13 +0200
-Subject: setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT.
+Subject: [PATCH] setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT.
 
 ---
  dlls/setupapi/queue.c | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
-index 5c2e4c7..9c63242 100644
+index 8dae62e..c82e4fa 100644
 --- a/dlls/setupapi/queue.c
 +++ b/dlls/setupapi/queue.c
-@@ -1101,7 +1101,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
+@@ -1135,7 +1135,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
          }
      }
      if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE |
@@ -20,7 +20,7 @@ index 5c2e4c7..9c63242 100644
      {
          ERR("Unsupported style(s) 0x%x\n",style);
      }
-@@ -1110,6 +1110,24 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
+@@ -1144,6 +1144,24 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
      {
          rc = CopyFileW(source,target,FALSE);
          TRACE("Did copy... rc was %i\n",rc);
@@ -43,8 +43,8 @@ index 5c2e4c7..9c63242 100644
 +            }
 +        }
      }
- 
-     /* after copy processing */
+     else
+         SetLastError(ERROR_SUCCESS);
 -- 
-2.9.0
+1.9.1
 

patches/wined3d-Dual_Source_Blending/0003-wined3d-Implement-dual-source-blending.patch

@@ -1,4 +1,4 @@
-From f1311cedfacb7ac5ecb35fa11233457ed25efa0f Mon Sep 17 00:00:00 2001
+From 3bf17d57ac7a55640cf1c6f16f5bf41d96e31d43 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:51:59 +0200
 Subject: [PATCH] wined3d: Implement dual source blending.
@@ -27,7 +27,7 @@ index 4b2f435..d6d4f0a 100644
  
      ID3D11BlendState_Release(blend_state);
 diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
-index 319d613..db00828 100644
+index 09ea350..231955a 100644
 --- a/dlls/wined3d/adapter_gl.c
 +++ b/dlls/wined3d/adapter_gl.c
 @@ -2924,6 +2924,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct
@@ -43,7 +43,7 @@ index 319d613..db00828 100644
      if (gl_info->supported[ARB_MULTITEXTURE])
      {
          if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])
-@@ -3750,6 +3756,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
+@@ -3751,6 +3757,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
  
      TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages);
  
@@ -55,10 +55,10 @@ index 319d613..db00828 100644
      {
          /* We do not want to deal with re-creating immutable texture storage
 diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
-index 97d7656..983bc96 100644
+index aa4d260..2c7935c 100644
 --- a/dlls/wined3d/context.c
 +++ b/dlls/wined3d/context.c
-@@ -3142,10 +3142,20 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context
+@@ -3153,10 +3153,20 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context
      else if (!context->render_offscreen)
          return context_generate_rt_mask_from_resource(rts[0]->resource);
  
@@ -81,10 +81,10 @@ index 97d7656..983bc96 100644
      {
          i = wined3d_bit_scan(&mask);
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 6493e7f..ef92ec1 100644
+index f85fb5a..066a8fd 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -3094,6 +3094,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
+@@ -2811,6 +2811,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
              break;
  
          case WINED3DSPR_COLOROUT:
@@ -92,7 +92,7 @@ index 6493e7f..ef92ec1 100644
              if (reg->idx[0].offset >= gl_info->limits.buffers)
                  WARN("Write to render target %u, only %d supported.\n",
                          reg->idx[0].offset, gl_info->limits.buffers);
-@@ -7998,7 +7999,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
+@@ -7715,7 +7716,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
      {
          const struct wined3d_shader_signature *output_signature = &shader->output_signature;
  
@@ -104,7 +104,7 @@ index 6493e7f..ef92ec1 100644
          if (output_signature->element_count)
          {
              for (i = 0; i < output_signature->element_count; ++i)
-@@ -8013,7 +8017,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
+@@ -7730,7 +7734,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
                      continue;
                  }
                  if (shader_glsl_use_explicit_attrib_location(gl_info))
@@ -118,7 +118,7 @@ index 6493e7f..ef92ec1 100644
                  shader_addline(buffer, "out %s4 color_out%u;\n",
                          component_type_info[output->component_type].glsl_vector_type, output->semantic_idx);
              }
-@@ -8026,7 +8035,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
+@@ -7743,7 +7752,12 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
              {
                  i = wined3d_bit_scan(&mask);
                  if (shader_glsl_use_explicit_attrib_location(gl_info))
@@ -146,7 +146,7 @@ index 609b574..138b2dd 100644
  
  static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device,
 diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
-index 0f35f2a..8ff0ba6 100644
+index 08423e8..b22122d 100644
 --- a/dlls/wined3d/state.c
 +++ b/dlls/wined3d/state.c
 @@ -533,12 +533,14 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
@@ -189,7 +189,7 @@ index 0f35f2a..8ff0ba6 100644
              state->render_states[WINED3D_RS_SRCBLEND],
              state->render_states[WINED3D_RS_DESTBLEND], rt_format);
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 0c315af..8c454a0 100644
+index dca3e81..a1c6d4e 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
 @@ -197,6 +197,7 @@ struct wined3d_d3d_info
@@ -210,17 +210,17 @@ index 0c315af..8c454a0 100644
  };
  
  enum fog_src_type
-@@ -1944,7 +1946,8 @@ struct wined3d_context
+@@ -1938,7 +1940,8 @@ struct wined3d_context
      DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */
      DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */
      DWORD num_untracked_materials : 2;  /* Max value 2 */
--    DWORD padding : 8;
+-    DWORD padding : 9;
 +    DWORD last_was_dual_blend : 1;
-+    DWORD padding : 7;
++    DWORD padding : 8;
  
      DWORD constant_update_mask;
      DWORD numbered_array_mask;
-@@ -2605,6 +2608,7 @@ struct wined3d_fbo_ops
+@@ -2614,6 +2617,7 @@ struct wined3d_fbo_ops
  struct wined3d_gl_limits
  {
      UINT buffers;
@@ -228,7 +228,7 @@ index 0c315af..8c454a0 100644
      UINT lights;
      UINT textures;
      UINT texture_coords;
-@@ -3070,6 +3074,22 @@ struct wined3d_state
+@@ -3079,6 +3083,22 @@ struct wined3d_state
      struct wined3d_rasterizer_state *rasterizer_state;
  };