Rebase againsts 9ae8b8c00f2cca205fdf4ce76e221778b7dfbea7

patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch

@@ -1,22 +1,21 @@
-From 48d707f925a861df887aa11c13e062aa700bf3d8 Mon Sep 17 00:00:00 2001
+From 359733a8080403adeca1f87472cdad1884c4affb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 14 Dec 2014 20:49:28 +0100
-Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT
- definition set.
+Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT definition set.
 
 ---
  configure.ac                  |  3 ++-
- dlls/wined3d-csmt/Makefile.in | 37 +++++++++++++++++++++++++++++++++++++
+ dlls/wined3d-csmt/Makefile.in | 36 ++++++++++++++++++++++++++++++++++++
  dlls/wined3d-csmt/version.rc  | 27 +++++++++++++++++++++++++++
- 3 files changed, 66 insertions(+), 1 deletion(-)
+ 3 files changed, 65 insertions(+), 1 deletion(-)
  create mode 100644 dlls/wined3d-csmt/Makefile.in
  create mode 100644 dlls/wined3d-csmt/version.rc
 
 diff --git a/configure.ac b/configure.ac
-index 234d288..9161305 100644
+index 7b796ef..fbaca8e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3805,7 +3805,8 @@ WINE_CONFIG_DLL(wineandroid.drv)
+@@ -3679,7 +3679,8 @@ WINE_CONFIG_DLL(wineandroid.drv)
  WINE_CONFIG_DLL(winebus.sys)
  WINE_CONFIG_DLL(winecoreaudio.drv)
  WINE_CONFIG_LIB(winecrt0)
@@ -28,10 +27,10 @@ index 234d288..9161305 100644
  WINE_CONFIG_DLL(winejoystick.drv)
 diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in
 new file mode 100644
-index 0000000..bf064ed
+index 0000000..1d0458e
 --- /dev/null
 +++ b/dlls/wined3d-csmt/Makefile.in
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +EXTRADEFS = -DSTAGING_CSMT
 +MODULE    = wined3d-csmt.dll
 +IMPORTS   = uuid opengl32 user32 gdi32 advapi32
@@ -46,7 +45,6 @@ index 0000000..bf064ed
 +	cs.c \
 +	device.c \
 +	directx.c \
-+	drawprim.c \
 +	dxtn.c \
 +	gl_compat.c \
 +	glsl_shader.c \