Rebase against 9781b5433cd4b708c0f537aa0b5608ff4157f04c

patches/wined3d-DXTn/0001-wined3d-add-DXTn-support.patch

@@ -1,24 +1,24 @@
-From e1402515ec1008c3393d434a1016a717c791bd62 Mon Sep 17 00:00:00 2001
+From 51d0b968215a8fc788994e85ad4837a406aafc61 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 30 Mar 2018 08:25:44 +0000
 Subject: [PATCH] wined3d: add DXTn support
 
 ---
  dlls/wined3d/Makefile.in  |   1 +
- dlls/wined3d/dxtn.c       | 435 ++++++++++++++++++++
- dlls/wined3d/dxtn.h       | 987 ++++++++++++++++++++++++++++++++++++++++++++++
- dlls/wined3d/surface.c    | 153 +++++++
- dlls/wined3d/wined3d.spec |   7 +
+ dlls/wined3d/dxtn.c       | 435 +++++++++++++++++
+ dlls/wined3d/dxtn.h       | 987 ++++++++++++++++++++++++++++++++++++++
+ dlls/wined3d/surface.c    | 153 ++++++
+ dlls/wined3d/wined3d.spec |   8 +
  include/wine/wined3d.h    |  13 +
- 6 files changed, 1596 insertions(+)
+ 6 files changed, 1597 insertions(+)
  create mode 100644 dlls/wined3d/dxtn.c
  create mode 100644 dlls/wined3d/dxtn.h
 
 diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
-index 58fc2d5..b850ba6 100644
+index 39fed381d97..abc0ec6adba 100644
 --- a/dlls/wined3d/Makefile.in
 +++ b/dlls/wined3d/Makefile.in
-@@ -10,6 +10,7 @@ C_SRCS = \
+@@ -11,6 +11,7 @@ C_SRCS = \
  	cs.c \
  	device.c \
  	directx.c \
@@ -28,7 +28,7 @@ index 58fc2d5..b850ba6 100644
  	nvidia_texture_shader.c \
 diff --git a/dlls/wined3d/dxtn.c b/dlls/wined3d/dxtn.c
 new file mode 100644
-index 0000000..4e24fb5
+index 00000000000..4e24fb56419
 --- /dev/null
 +++ b/dlls/wined3d/dxtn.c
 @@ -0,0 +1,435 @@
@@ -469,7 +469,7 @@ index 0000000..4e24fb5
 +}
 diff --git a/dlls/wined3d/dxtn.h b/dlls/wined3d/dxtn.h
 new file mode 100644
-index 0000000..23536c0
+index 00000000000..23536c091cc
 --- /dev/null
 +++ b/dlls/wined3d/dxtn.h
 @@ -0,0 +1,987 @@
@@ -1461,10 +1461,10 @@ index 0000000..23536c0
 +   }
 +}
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index ba0b647..30421b9 100644
+index b048b6ef852..5db449863d4 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -820,6 +820,126 @@ static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst,
+@@ -593,6 +593,126 @@ static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst,
      }
  }
  
@@ -1591,7 +1591,7 @@ index ba0b647..30421b9 100644
  struct d3dfmt_converter_desc
  {
      enum wined3d_format_id from, to;
-@@ -837,6 +957,33 @@ static const struct d3dfmt_converter_desc converters[] =
+@@ -610,6 +730,33 @@ static const struct d3dfmt_converter_desc converters[] =
      {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_L8_UNORM,        convert_x8r8g8b8_l8},
  };
  
@@ -1625,7 +1625,7 @@ index ba0b647..30421b9 100644
  static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from,
          enum wined3d_format_id to)
  {
-@@ -848,6 +995,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
+@@ -621,6 +768,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
              return &converters[i];
      }
  
@@ -1639,13 +1639,13 @@ index ba0b647..30421b9 100644
  }
  
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 93cecf0..78cf50d 100644
+index e0777b8e209..d75beb88511 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -314,3 +314,10 @@
- @ cdecl wined3d_vertex_declaration_decref(ptr)
- @ cdecl wined3d_vertex_declaration_get_parent(ptr)
+@@ -319,3 +319,11 @@
  @ cdecl wined3d_vertex_declaration_incref(ptr)
+ 
+ @ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long)
 +
 +@ cdecl wined3d_dxt1_decode(ptr ptr long long long long long)
 +@ cdecl wined3d_dxt1_encode(ptr ptr long long long long long)
@@ -1653,11 +1653,12 @@ index 93cecf0..78cf50d 100644
 +@ cdecl wined3d_dxt3_encode(ptr ptr long long long long long)
 +@ cdecl wined3d_dxt5_decode(ptr ptr long long long long long)
 +@ cdecl wined3d_dxt5_encode(ptr ptr long long long long long)
++
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 239ccd8..614805a 100644
+index 37b093fa94d..29889b86f53 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -2793,4 +2793,17 @@ static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, u
+@@ -2815,4 +2815,17 @@ static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, u
      box->back = back;
  }
  
@@ -1676,5 +1677,5 @@ index 239ccd8..614805a 100644
 +
  #endif /* __WINE_WINED3D_H */
 -- 
-2.7.4
+2.20.1