Fix some rebase failures

patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch

@@ -1,4 +1,4 @@
-From 8f283b558ea348bd21cee56beb8219758d55a379 Mon Sep 17 00:00:00 2001
+From ba82f3225b3d2491f702d7f82a2f22fd50425198 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 20 Sep 2014 02:48:07 +0200
 Subject: [PATCH] wined3d: Add support for DXTn software decoding through
@@ -13,16 +13,16 @@ Changes in rev 3:
 * Do not require txc_dxtn at compile time by trying some fallback paths.
 ---
  configure.ac                   |   3 +
- dlls/wined3d/Makefile.in       |   2 +
+ dlls/wined3d/Makefile.in       |   1 +
  dlls/wined3d/dxtn.c            | 299 +++++++++++++++++++++++++++++++++++++++++
  dlls/wined3d/surface.c         |  80 +++++++++++
  dlls/wined3d/wined3d_main.c    |   5 +
  dlls/wined3d/wined3d_private.h |  13 ++
- 6 files changed, 402 insertions(+)
+ 6 files changed, 401 insertions(+)
  create mode 100644 dlls/wined3d/dxtn.c
 
 diff --git a/configure.ac b/configure.ac
-index 643c713..a867d25 100644
+index 7b796ef..7b26e45 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1737,6 +1737,9 @@ fi
@@ -36,14 +36,13 @@ index 643c713..a867d25 100644
  if test "x$with_mpg123" != "xno"
  then
 diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
-index 58fc2d5..70f47c6 100644
+index 58fc2d5..b850ba6 100644
 --- a/dlls/wined3d/Makefile.in
 +++ b/dlls/wined3d/Makefile.in
-@@ -10,6 +10,8 @@ C_SRCS = \
+@@ -10,6 +10,7 @@ C_SRCS = \
  	cs.c \
  	device.c \
  	directx.c \
-+	drawprim.c \
 +	dxtn.c \
  	gl_compat.c \
  	glsl_shader.c \
@@ -459,7 +458,7 @@ index 9ef917f..7201a7c 100644
  }
  
 diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
-index 6cd6f18..28e6fe6 100644
+index b57bcdc..1de0e56 100644
 --- a/dlls/wined3d/wined3d_main.c
 +++ b/dlls/wined3d/wined3d_main.c
 @@ -326,6 +326,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
@@ -482,10 +481,10 @@ index 6cd6f18..28e6fe6 100644
  }
  
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 816eebb..3f6500d 100644
+index 7813df5..45fe82a 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -4451,6 +4451,19 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs)
+@@ -4447,6 +4447,19 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs)
      assert(cs->thread_id != GetCurrentThreadId());
  }
  
@@ -506,5 +505,5 @@ index 816eebb..3f6500d 100644
  #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"
  
 -- 
-1.9.1
+2.7.4