https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcb816619abf78ab467a64...
commit bcb816619abf78ab467a6491fe1e68d9d9d9fda8 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Mon Oct 1 00:19:39 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Mon Oct 1 00:19:39 2018 +0100
[D3DX9_36] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dx9_36/mesh.c | 2 +- dll/directx/wine/d3dx9_36/surface.c | 3 --- media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index 204e0b5e86..b1d9f68ade 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -5169,7 +5169,7 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) { - FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); + FIXME("device %p, mesh %p, adjacency %p semi-stub.\n", device, mesh, adjacency);
return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency); } diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index a1e56bda6d..73a1cbde1a 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -1827,13 +1827,10 @@ static dxtn_conversion_func get_dxtn_conversion_func(D3DFORMAT format, BOOL enco switch (format) { case D3DFMT_DXT1: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt1_encode : wined3d_dxt1_decode; case D3DFMT_DXT3: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt3_encode : wined3d_dxt3_decode; case D3DFMT_DXT5: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt5_encode : wined3d_dxt5_decode; default: return NULL; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d1e9eaa12b..0fa0aa7abf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -26,7 +26,7 @@ reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.9 -reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.9 +reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3 reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.9 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9
-
Amine Khaldi