Rebase against upstream changes.

This commit is contained in:
Sebastian Lackner
2015-03-31 00:53:08 +02:00
parent 006db23dab
commit cc9f3cfa0e
27 changed files with 144 additions and 1322 deletions

View File

@@ -1,4 +1,4 @@
From 748930c574cb486b0eeb31bbce189c014a865a3b Mon Sep 17 00:00:00 2001
From 2774478cc69a3305989724186a0b68ca99f1fe61 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sat, 1 Nov 2014 13:08:05 +0100
Subject: d3dx9_36: Add dxtn support.
@@ -22,7 +22,7 @@ index 5958c57..aa387b5 100644
C_SRCS = \
core.c \
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index f187031..70dc0cd 100644
index 295ef63..ed1caff 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -18,6 +18,7 @@
@@ -76,7 +76,7 @@ index f187031..70dc0cd 100644
struct volume src_size, dst_size;
+ HRESULT ret = D3D_OK;
TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s %#x, 0x%08x)\n",
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,
@@ -1838,8 +1863,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
}
@@ -221,5 +221,5 @@ index 7a4dff8..87c3eb7 100644
check_release((IUnknown*)newsurf, 1);
check_release((IUnknown*)tex, 0);
--
2.2.1
2.3.3