From 78156b24d49bcb073b24639ee5585e297b86a1b3 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 10 Dec 2014 18:51:06 -0700 Subject: [PATCH] Add missing include to d3dx9 DXTn patch. --- .../0001-d3dx9_36-Add-dxtn-support.patch | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index b3b11221..f280745a 100644 --- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch +++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -1,12 +1,12 @@ -From d49f4a13145f3dd88f2be8d67baf8546ddff4bfd Mon Sep 17 00:00:00 2001 +From 6773fab0b632916e095756834c29b126354148a1 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 1 Nov 2014 13:08:05 +0100 Subject: d3dx9_36: Add dxtn support. --- dlls/d3dx9_36/Makefile.in | 2 +- - dlls/d3dx9_36/surface.c | 100 ++++++++++++++++++++++++++++++++++++++++++---- - 2 files changed, 94 insertions(+), 8 deletions(-) + dlls/d3dx9_36/surface.c | 101 ++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 95 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 5958c57..aa387b5 100644 @@ -21,19 +21,20 @@ index 5958c57..aa387b5 100644 C_SRCS = \ core.c \ diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c -index c91048b..9813ce1 100644 +index f187031..a8c4136 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c -@@ -26,6 +26,8 @@ +@@ -26,6 +26,9 @@ #include "ole2.h" #include "wincodec.h" ++#include "config.h" +#include "wine/wined3d.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -@@ -1715,6 +1717,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic +@@ -1716,6 +1719,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic } } @@ -58,7 +59,7 @@ index c91048b..9813ce1 100644 /************************************************************ * D3DXLoadSurfaceFromMemory * -@@ -1756,6 +1776,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1757,6 +1778,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; @@ -66,7 +67,7 @@ index c91048b..9813ce1 100644 TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, -@@ -1837,8 +1858,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1838,8 +1860,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { @@ -84,7 +85,7 @@ index c91048b..9813ce1 100644 { FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; -@@ -1847,10 +1875,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1848,10 +1877,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; @@ -139,7 +140,7 @@ index c91048b..9813ce1 100644 } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ { -@@ -1859,14 +1929,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1860,14 +1931,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ @@ -174,5 +175,5 @@ index c91048b..9813ce1 100644 /************************************************************ -- -2.1.3 +1.9.1