patchupdate.py: Fix issue when detecting dependencies, make wined3d-CSMT_Main depend on wined3d-Color_Key.

patches/wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch

@@ -1,4 +1,4 @@
-From da5210457d0a852e97fd20fed4b33030585b0549 Mon Sep 17 00:00:00 2001
+From b41b544254e1074c64732e641d8eaa962418a7d6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Sun, 17 Nov 2013 19:34:26 +0100
 Subject: wined3d: Pass a context to surface_load_drawable and
@@ -9,10 +9,10 @@ Subject: wined3d: Pass a context to surface_load_drawable and
  1 file changed, 34 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index ef6a233..7a32f7f 100644
+index 9731368..93ea13b 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -3452,19 +3452,35 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW
+@@ -3597,19 +3597,35 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW
      rect->bottom = drawable_height - rect->bottom;
  }
  
@@ -49,7 +49,7 @@ index ef6a233..7a32f7f 100644
      gl_info = context->gl_info;
  
      /* Make sure the surface is up-to-date. This should probably use
-@@ -3517,7 +3533,12 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
+@@ -3662,7 +3678,12 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
              && dst_surface->container->swapchain->front_buffer == dst_surface->container))
          gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
  
@@ -63,7 +63,7 @@ index ef6a233..7a32f7f 100644
  }
  
  HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color)
-@@ -3668,6 +3689,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
+@@ -3813,6 +3834,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
          /* Blit from offscreen surface to render target */
          struct wined3d_color_key old_blt_key = src_surface->container->src_blt_color_key;
          DWORD old_color_key_flags = src_surface->container->color_key_flags;
@@ -71,8 +71,8 @@ index ef6a233..7a32f7f 100644
  
          TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface);
  
-@@ -3701,9 +3723,11 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
-             wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL);
+@@ -3846,9 +3868,11 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
+             wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT, NULL);
          }
  
 -        surface_blt_to_drawable(device, filter,
@@ -83,8 +83,8 @@ index ef6a233..7a32f7f 100644
 +        context_release(context);
  
          /* Restore the color key parameters */
-         wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT,
-@@ -4066,8 +4090,9 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
+         wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT,
+@@ -4211,8 +4235,9 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
              surface, wined3d_debug_location(surface->locations));
  }
  
@@ -95,7 +95,7 @@ index ef6a233..7a32f7f 100644
  {
      RECT r;
  
-@@ -4080,7 +4105,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
+@@ -4225,7 +4250,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
  
      surface_get_rect(surface, NULL, &r);
      surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB);
@@ -104,7 +104,7 @@ index ef6a233..7a32f7f 100644
              WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);
  
      return WINED3D_OK;
-@@ -4345,7 +4370,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
+@@ -4491,7 +4516,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location)
              break;
  
          case WINED3D_LOCATION_DRAWABLE:
@@ -117,5 +117,5 @@ index ef6a233..7a32f7f 100644
              break;
  
 -- 
-2.1.3
+2.2.1
 

patches/wined3d-CSMT_Main/0012-wined3d-Remove-surface_validate_location.patch

@@ -1,4 +1,4 @@
-From c24cea315381bd5666541f3717079e3d09c02ff4 Mon Sep 17 00:00:00 2001
+From 988e5a90aab7988d0b301c438c101d9c0a04f699 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Sat, 4 Jan 2014 00:53:47 +0100
 Subject: wined3d: Remove surface_validate_location.
@@ -39,7 +39,7 @@ index 4ac9c3e..99f4e96 100644
              }
          }
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 1ed3e46..f756621 100644
+index 93c93bc..d2bbd44 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -1224,7 +1224,7 @@ static void surface_unload(struct wined3d_resource *resource)
@@ -97,7 +97,7 @@ index 1ed3e46..f756621 100644
  }
  
 @@ -3932,7 +3932,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
-         wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT,
+         wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT,
                  (old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL);
  
 -        surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding);
@@ -156,10 +156,10 @@ index 1ed3e46..f756621 100644
      }
  
 diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
-index 4d7eb32..3b0c6b3 100644
+index 601d3ad..bdb4b67 100644
 --- a/dlls/wined3d/swapchain.c
 +++ b/dlls/wined3d/swapchain.c
-@@ -574,19 +574,19 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -569,19 +569,19 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
              /* Tell the front buffer surface that is has been modified. However,
               * the other locations were preserved during that, so keep the flags.
               * This serves to update the emulated overlay, if any. */
@@ -183,7 +183,7 @@ index 4d7eb32..3b0c6b3 100644
          surface_invalidate_location(front, ~WINED3D_LOCATION_DRAWABLE);
          /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM
           * and INTEXTURE copies can keep their old content if they have any defined content.
-@@ -595,7 +595,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -590,7 +590,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
           */
          if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP)
          {
@@ -192,7 +192,7 @@ index 4d7eb32..3b0c6b3 100644
              surface_invalidate_location(back_buffer, ~back_buffer->container->resource.draw_binding);
          }
      }
-@@ -870,7 +870,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
+@@ -865,7 +865,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
      wined3d_texture_set_swapchain(swapchain->front_buffer, swapchain);
      if (!(device->wined3d->flags & WINED3D_NO3D))
      {
@@ -227,5 +227,5 @@ index 8203200..1a5cc7b 100644
          GLenum target, unsigned int level, unsigned int layer, DWORD flags,
          struct wined3d_surface **surface) DECLSPEC_HIDDEN;
 -- 
-1.9.1
+2.2.1
 

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -7678,7 +7678,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
          TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface);
  
 @@ -3603,6 +4426,7 @@
-             wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL);
+             wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT, NULL);
          }
  
 +#if defined(STAGING_CSMT)
@@ -7695,7 +7695,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
 +                src_surface, src_rect, dst_surface, dst_rect);
 +
 +        /* Restore the color key parameters */
-+        wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT,
++        wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT,
 +                (old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL);
 +
 +        surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding);

patches/wined3d-CSMT_Main/definition

@@ -1,3 +1,4 @@
 Fixes: [11674] Support for CSMT (command stream) to increase graphic performance
 Depends: wined3d-CSMT_Helper
+Depends: wined3d-Color_Key
 IfDefined: STAGING_CSMT