diff --git a/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch b/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch index a403c74f..6b5ccfde 100644 --- a/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch +++ b/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch @@ -1,4 +1,4 @@ -From 8dfdd1054d4db1718707cc765fcd2d05d64c6c96 Mon Sep 17 00:00:00 2001 +From b02ee3d1c5dc1fd3040f81d87d3b17f5148fe2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 28 Jul 2015 17:26:09 +0200 Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof @@ -11,12 +11,12 @@ Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h -index 556d213..bc40531 100644 +index a0e62f1..e9f7187 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h -@@ -196,4 +196,6 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; - HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, - const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; +@@ -198,4 +198,6 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, + HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, + struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3dafb667..d991cdf2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "3dbd46716299883761be9c4c4173a5f0402b2f7c" + echo "ab78cffea7ac676a7041c7d6941b61140cfe005c" } # Show version information diff --git a/patches/wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch b/patches/wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch index 2fb8a0e8..1ed5274a 100644 --- a/patches/wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch +++ b/patches/wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch @@ -1,4 +1,4 @@ -From bf05198e84d5e154902542508e769163fcda3cc8 Mon Sep 17 00:00:00 2001 +From b8c44cd1d2f029251cf05c9620b4cdc52b1e43fd Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 21 Mar 2016 18:27:59 +0100 Subject: wined3d: Silence extremely noisy FIXME in @@ -9,11 +9,11 @@ Subject: wined3d: Silence extremely noisy FIXME in 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 3476b32e..ec2f372 100644 +index c8a7695..33b2204 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1036,7 +1036,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, - } +@@ -1230,7 +1230,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, + sub_resource_idx = layer * texture->level_count; if (dirty_region) - FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region));