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 0bef1269..ac0c035e 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,7 +1,7 @@ -From bc50ed481ea6cfa40ac3925abe6121a91e6fa1c2 Mon Sep 17 00:00:00 2001 +From 33854851913e9046eb6ea4cd765a2f0026729f07 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 1 Nov 2014 13:08:05 +0100 -Subject: [PATCH] d3dx9_36: Add dxtn support. +Subject: d3dx9_36: Add dxtn support. --- dlls/d3dx9_24/Makefile.in | 2 +- @@ -23,7 +23,10 @@ Subject: [PATCH] d3dx9_36: Add dxtn support. dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- - 19 files changed, 117 insertions(+), 28 deletions(-) + dlls/d3dx9_41/Makefile.in | 2 +- + dlls/d3dx9_42/Makefile.in | 2 +- + dlls/d3dx9_43/Makefile.in | 2 +- + 22 files changed, 120 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 6810b79..6a9e51e 100644 @@ -183,7 +186,7 @@ index 6bb605d..74c8cae 100644 C_SRCS = \ diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c -index 89a2e3d..87a4125 100644 +index fc747799d6d..f851e74ee76 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -27,6 +27,8 @@ @@ -195,7 +198,7 @@ index 89a2e3d..87a4125 100644 WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -@@ -1817,6 +1819,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic +@@ -1715,6 +1717,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic } } @@ -223,7 +226,7 @@ index 89a2e3d..87a4125 100644 /************************************************************ * D3DXLoadSurfaceFromMemory * -@@ -1858,6 +1881,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1756,6 +1779,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; @@ -231,7 +234,7 @@ index 89a2e3d..87a4125 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, -@@ -1939,8 +1963,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1837,8 +1861,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { @@ -249,7 +252,7 @@ index 89a2e3d..87a4125 100644 { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); return E_NOTIMPL; -@@ -1949,10 +1980,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1847,10 +1878,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; @@ -304,7 +307,7 @@ index 89a2e3d..87a4125 100644 } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ { -@@ -1961,14 +2034,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1859,14 +1932,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. */ @@ -339,10 +342,10 @@ index 89a2e3d..87a4125 100644 /************************************************************ diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c -index 26adc73..e45ee36 100644 +index f2855e8ddb8..2be48dfddab 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c -@@ -1200,7 +1200,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1174,7 +1174,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -351,7 +354,7 @@ index 26adc73..e45ee36 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } -@@ -1226,7 +1226,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1200,7 +1200,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -360,7 +363,7 @@ index 26adc73..e45ee36 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } -@@ -1239,10 +1239,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1213,10 +1213,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -421,6 +424,41 @@ index 6f08759..ecb4af5 100644 EXTRADEFS = -D_D3DX9_VER=40 PARENTSRC = ../d3dx9_36 +diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in +index d4552cf608..077dd8d378 100644 +--- a/dlls/d3dx9_41/Makefile.in ++++ b/dlls/d3dx9_41/Makefile.in +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=41 + MODULE = d3dx9_41.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=41 + PARENTSRC = ../d3dx9_36 + +diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in +index 5806fce66c..f8ab072d34 100644 +--- a/dlls/d3dx9_42/Makefile.in ++++ b/dlls/d3dx9_42/Makefile.in +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=42 + MODULE = d3dx9_42.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=42 + PARENTSRC = ../d3dx9_36 + +diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in +index 72ba8b4c1e..b1c7c77740 100644 +--- a/dlls/d3dx9_43/Makefile.in ++++ b/dlls/d3dx9_43/Makefile.in +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=43 + MODULE = d3dx9_43.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=43 + PARENTSRC = ../d3dx9_36 + -- -1.9.1 - +2.11.0