mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 03ee99b43c2a01ce0e6f77fc0bbc71570a695336.
This commit is contained in:
Sebastian Lackner
parent
c11992eadd
commit
51601eed6f
@ -1,4 +1,4 @@
|
||||
From 5dfbc3b61422b52ee6763b39b60d0e6bce6cc63b Mon Sep 17 00:00:00 2001
|
||||
From 95470685fda5c2e5e74c88d2d689159c3af478e8 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 14 Mar 2015 17:00:08 +0100
|
||||
Subject: d3dx9_36: Allow to query for d3dx9_26 specific ID3DXEffect interface.
|
||||
@ -8,12 +8,12 @@ Subject: d3dx9_36: Allow to query for d3dx9_26 specific ID3DXEffect interface.
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
|
||||
index 8e2f850..0cb220a 100644
|
||||
index 8f82784..384af3f 100644
|
||||
--- a/dlls/d3dx9_36/effect.c
|
||||
+++ b/dlls/d3dx9_36/effect.c
|
||||
@@ -27,6 +27,11 @@
|
||||
#include "wingdi.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
@@ -22,6 +22,11 @@
|
||||
|
||||
#include "d3dx9_private.h"
|
||||
#include "d3dcompiler.h"
|
||||
+#include "initguid.h"
|
||||
+
|
||||
@ -23,7 +23,7 @@ index 8e2f850..0cb220a 100644
|
||||
|
||||
/* Constants for special INT/FLOAT conversation */
|
||||
#define INT_FLOAT_MULTI 255.0f
|
||||
@@ -2501,7 +2506,8 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID
|
||||
@@ -2862,7 +2867,8 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID
|
||||
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
|
||||
|
||||
if (IsEqualGUID(riid, &IID_IUnknown) ||
|
||||
@ -34,5 +34,5 @@ index 8e2f850..0cb220a 100644
|
||||
iface->lpVtbl->AddRef(iface);
|
||||
*object = iface;
|
||||
--
|
||||
2.3.2
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e978148d40107aa9ec6d1affc65f4386188940eb Mon Sep 17 00:00:00 2001
|
||||
From af160ceb1fc68b5c3edb35d9bbe0ab3bc2bb7563 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Sat, 13 Feb 2016 15:29:37 +0100
|
||||
Subject: d3dx9_36: Implement D3DXDisassembleShader. (v2)
|
||||
@ -10,7 +10,7 @@ Changes in v2 (by Christian Costa):
|
||||
1 file changed, 328 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
|
||||
index 50d5669..d2ee03f 100644
|
||||
index 0f6e226..4b63f4c 100644
|
||||
--- a/dlls/d3dx9_36/shader.c
|
||||
+++ b/dlls/d3dx9_36/shader.c
|
||||
@@ -1,7 +1,7 @@
|
||||
@ -28,9 +28,9 @@ index 50d5669..d2ee03f 100644
|
||||
#include "wine/port.h"
|
||||
+#include <stdio.h>
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
@@ -2147,10 +2148,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
|
||||
#include "d3dx9_private.h"
|
||||
#include "d3dcommon.h"
|
||||
@@ -2142,10 +2143,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
|
||||
return D3D_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -5,15 +5,15 @@ Subject: d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds
|
||||
file.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/d3dx9_36_private.h | 2 ++
|
||||
dlls/d3dx9_36/d3dx9_private.h | 2 ++
|
||||
dlls/d3dx9_36/surface.c | 62 ++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/d3dx9_36/texture.c | 5 +---
|
||||
3 files changed, 65 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
|
||||
index 79f3b76..41bed31 100644
|
||||
--- a/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
--- a/dlls/d3dx9_36/d3dx9_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_private.h
|
||||
@@ -97,6 +97,8 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d
|
||||
const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
|
||||
HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data,
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
From ee84dfd270e8bd762acf6589fe697cdcfc6b431b Mon Sep 17 00:00:00 2001
|
||||
From 14de286e5d59419e946e9459df0426c1c5ab7f7d 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.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/Makefile.in | 2 +-
|
||||
dlls/d3dx9_36/surface.c | 104 +++++++++++++++++++++++++++++++++++++++---
|
||||
dlls/d3dx9_36/surface.c | 103 +++++++++++++++++++++++++++++++++++++++---
|
||||
dlls/d3dx9_36/tests/surface.c | 8 ++--
|
||||
3 files changed, 102 insertions(+), 12 deletions(-)
|
||||
3 files changed, 101 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
|
||||
index 95e3045..fd710c2 100644
|
||||
@ -22,18 +22,10 @@ index 95e3045..fd710c2 100644
|
||||
C_SRCS = \
|
||||
animation.c \
|
||||
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
|
||||
index 4fa2a76..832698e 100644
|
||||
index 1bfe75a..4099cd5 100644
|
||||
--- a/dlls/d3dx9_36/surface.c
|
||||
+++ b/dlls/d3dx9_36/surface.c
|
||||
@@ -18,6 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "d3dx9_36_private.h"
|
||||
@@ -26,6 +27,8 @@
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "ole2.h"
|
||||
#include "wincodec.h"
|
||||
|
||||
@ -42,7 +34,7 @@ index 4fa2a76..832698e 100644
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
|
||||
@@ -1714,6 +1717,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
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,7 +62,7 @@ index 4fa2a76..832698e 100644
|
||||
/************************************************************
|
||||
* D3DXLoadSurfaceFromMemory
|
||||
*
|
||||
@@ -1755,6 +1779,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;
|
||||
@ -78,7 +70,7 @@ index 4fa2a76..832698e 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,
|
||||
@@ -1836,8 +1861,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
@@ -1837,8 +1861,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
}
|
||||
else /* Stretching or format conversion. */
|
||||
{
|
||||
@ -96,7 +88,7 @@ index 4fa2a76..832698e 100644
|
||||
{
|
||||
FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format);
|
||||
return E_NOTIMPL;
|
||||
@@ -1846,10 +1878,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;
|
||||
|
||||
@ -151,7 +143,7 @@ index 4fa2a76..832698e 100644
|
||||
}
|
||||
else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
|
||||
{
|
||||
@@ -1858,14 +1932,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. */
|
||||
@ -186,7 +178,7 @@ index 4fa2a76..832698e 100644
|
||||
|
||||
/************************************************************
|
||||
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
|
||||
index 55e3d88..3c953b0 100644
|
||||
index f2855e8..2be48df 100644
|
||||
--- a/dlls/d3dx9_36/tests/surface.c
|
||||
+++ b/dlls/d3dx9_36/tests/surface.c
|
||||
@@ -1174,7 +1174,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
@ -221,5 +213,5 @@ index 55e3d88..3c953b0 100644
|
||||
check_release((IUnknown*)newsurf, 1);
|
||||
check_release((IUnknown*)tex, 0);
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -5,22 +5,22 @@ Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
|
||||
when skin information is unavailable.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/d3dx9_36_private.h | 2 ++
|
||||
dlls/d3dx9_36/d3dx9_private.h | 2 ++
|
||||
dlls/d3dx9_36/mesh.c | 7 +++++++
|
||||
dlls/d3dx9_36/skin.c | 22 +++++++++++++++++++++-
|
||||
3 files changed, 30 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
|
||||
index 79f3b76..b6707f6 100644
|
||||
--- a/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_36_private.h
|
||||
--- a/dlls/d3dx9_36/d3dx9_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_private.h
|
||||
@@ -110,4 +110,6 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
|
||||
void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
|
||||
const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
|
||||
|
||||
+HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
|
||||
+
|
||||
#endif /* __WINE_D3DX9_36_PRIVATE_H */
|
||||
#endif /* __WINE_D3DX9_PRIVATE_H */
|
||||
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
|
||||
index 4aeac26..3cd85a3 100644
|
||||
--- a/dlls/d3dx9_36/mesh.c
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "62277fb7779f76341efc71999d59242055be5c31"
|
||||
echo "03ee99b43c2a01ce0e6f77fc0bbc71570a695336"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -3171,7 +3171,7 @@ fi
|
||||
# | * [#26898] Support for DDS file format in D3DXSaveTextureToFileInMemory
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/d3dx9_36_private.h, dlls/d3dx9_36/surface.c, dlls/d3dx9_36/texture.c
|
||||
# | * dlls/d3dx9_36/d3dx9_private.h, dlls/d3dx9_36/surface.c, dlls/d3dx9_36/texture.c
|
||||
# |
|
||||
if test "$enable_d3dx9_36_DDS" -eq 1; then
|
||||
patch_apply d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch
|
||||
@ -3209,7 +3209,7 @@ fi
|
||||
# | * [#33904] Return dummy ID3DXSkinInfo interface when skinning info not present
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/d3dx9_36_private.h, dlls/d3dx9_36/mesh.c, dlls/d3dx9_36/skin.c, dlls/d3dx9_36/tests/mesh.c
|
||||
# | * dlls/d3dx9_36/d3dx9_private.h, dlls/d3dx9_36/mesh.c, dlls/d3dx9_36/skin.c, dlls/d3dx9_36/tests/mesh.c
|
||||
# |
|
||||
if test "$enable_d3dx9_36_Dummy_Skininfo" -eq 1; then
|
||||
patch_apply d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user