Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[D3DX9_36] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 00:19:39 +01:00
parent c003509323
commit bcb816619a
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/directx/wine/d3dx9_36/mesh.c
View file

@ -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);
}

3
dll/directx/wine/d3dx9_36/surface.c
View file

@ -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;

2
media/doc/README.WINE
View file

@ -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