Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 01/01: [NTOS:MM][FASTFAT_NEW] Fix DBG usage, fixes Release build

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b705df731e98911c744bc… commit b705df731e98911c744bcd18311c2139583c3581 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 11:54:10 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 11:54:10 2021 +0300 [NTOS:MM][FASTFAT_NEW] Fix DBG usage, fixes Release build --- drivers/filesystems/fastfat_new/fatdata.c | 2 +- ntoskrnl/mm/rmap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat_new/fatdata.c b/drivers/filesystems/fastfat_new/fatdata.c index 0c92389d98e..1a7ead0cb23 100644 --- a/drivers/filesystems/fastfat_new/fatdata.c +++ b/drivers/filesystems/fastfat_new/fatdata.c @@ -233,7 +233,7 @@ Return Value: DebugTrace(0, DEBUG_TRACE_UNWIND, "FatExceptionFilter %X\n", ExceptionCode); DebugDump("FatExceptionFilter\n", Dbg, NULL ); -#ifdef DBG +#if DBG if( FatBreakOnInterestingExceptionStatus != 0 && ExceptionCode == FatBreakOnInterestingExceptionStatus ) { DbgBreakPoint(); diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index cb3f956ef35..a2169eeb54f 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -406,9 +406,11 @@ MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process, if (current_entry && (current_entry->Address == Address) && (current_entry->Process == Process)) { +#if DBG DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n", current_entry->Address); DbgPrint(" current caller %p\n", new_entry->Caller); DbgPrint(" previous caller %p\n", current_entry->Caller); +#endif KeBugCheck(MEMORY_MANAGEMENT); }

3 years, 10 months

[reactos] 218/218: [MEDIA] Update WINESYNC.txt for d3dx9 DLLs

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44eecfaa01e375384112e… commit 44eecfaa01e375384112ee011c7f27eac528a90f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jan 5 13:45:12 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [MEDIA] Update WINESYNC.txt for d3dx9 DLLs --- media/doc/WINESYNC.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index e84eeeac794..e73dccfd1f3 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -26,7 +26,7 @@ dll/directx/wine/d3d8 # Synced to WineStaging-3.3 dll/directx/wine/d3d9 # Synced to WineStaging-3.3 dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.18 dll/directx/wine/d3drm # Synced to WineStaging-4.18 -dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-4.0 +dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-6.0-rc5 dll/directx/wine/d3dxof # Synced to WineStaging-4.18 dll/directx/wine/ddraw # Synced to WineStaging-3.3 dll/directx/wine/devenum # Synced to WineStaging-4.18

3 years, 10 months

[reactos] 217/218: [WINESYNC]: d3dx9 is now in sync with wine-staging wine-6.0-rc5

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=236b5f77ab85d9975bc29… commit 236b5f77ab85d9975bc2935fbc46136db9a978e3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jan 5 13:22:42 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC]: d3dx9 is now in sync with wine-staging wine-6.0-rc5 --- sdk/tools/winesync/d3dx9.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 8e6beefe8fc..1d4d1a3fc76 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -34,4 +34,4 @@ files: include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h tags: - wine: e27a95e92097a601baa9b0e9dd6fcc5013c863fa + wine: wine-6.0-rc5

3 years, 10 months

[reactos] 216/218: [WINESYNC] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e1975b6aaab096c1d53b… commit 0e1975b6aaab096c1d53b96313093f22a27f04ed Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:41 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh. This patch fixes last problem of bug 32572. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/skin.c | 86 ++++++++- modules/rostests/winetests/d3dx9_36/mesh.c | 83 +++++++++ ...lement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff | 206 +++++++++++++++++++++ 3 files changed, 372 insertions(+), 3 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c index ea4f45d9b4f..e45d0cb40cf 100644 --- a/dll/directx/wine/d3dx9_36/skin.c +++ b/dll/directx/wine/d3dx9_36/skin.c @@ -5,6 +5,7 @@ * Skin Info operations specific to D3DX9. * * Copyright (C) 2011 Dylan Smith + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -403,10 +404,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) { - FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", - iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + DWORD size = D3DXGetFVFVertexSize(skin->fvf); + DWORD i, j; - return E_NOTIMPL; + TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", + skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + + if (bone_inv_transpose_transforms) + FIXME("Skinning vertices with two position elements not supported\n"); + + if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { + FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); + return E_FAIL; + } + + /* Reset all positions */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); + position->x = 0.0f; + position->y = 0.0f; + position->z = 0.0f; + } + + /* Update positions that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); + D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 position; + D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); + D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformCoord(&position, position_src, &matrix); + position_dest->x += weight * position.x; + position_dest->y += weight * position.y; + position_dest->z += weight * position.z; + } + } + + if (skin->fvf & D3DFVF_NORMAL) { + /* Reset all normals */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); + normal->x = 0.0f; + normal->y = 0.0f; + normal->z = 0.0f; + } + + /* Update normals that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 normal; + D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); + D3DXVec3TransformNormal(&normal, &normal, &matrix); + normal_dest->x += weight * normal.x; + normal_dest->y += weight * normal.y; + normal_dest->z += weight * normal.z; + } + } + + /* Normalize all normals that are influenced by bones*/ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); + if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) + D3DXVec3Normalize(normal_dest, normal_dest); + } + } + + return D3D_OK; } static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 3118a7d443f..eef408e2366 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -5265,6 +5265,88 @@ static void test_create_skin_info(void) ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } +static void test_update_skinned_mesh(void) +{ + static DWORD bone0_vertices[2] = { 1, 3 }; + static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; + static DWORD bone1_vertices[2] = { 2, 3 }; + static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; + static D3DMATRIX bones_matrix[2] = + { { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 2.0f, 2.0f, 4.0f, 1.0f + } } }, + { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -4.0f, -4.0f, 4.0f, 1.0f + } } } }; + static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, + { 1.0f, 0.0f, 0.0f }, + { 1.0f, 1.0f, -1.0f }, + { 0.0f, 1.0f, 0.0f }, + { -1.0f, -1.0f, 1.0f }, + { 0.0f, 0.0f, 1.0f }, + { -1.0f, -1.0f, -1.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f }, + { 3.0f, 3.0f, 3.0f }, + { 0.0f, 1.0f, 0.0f }, + { -5.0f, -5.0f, 5.0f }, + { 0.0f, 0.0f, 1.0f }, + { -2.0f, -2.0f, 3.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + D3DVECTOR vertices_dest[8]; + HRESULT hr; + ID3DXSkinInfo *skin_info; + D3DXMATRIX matrix; + int i; + + D3DXMatrixIdentity(&matrix); + for (i = 0; i < 8; i++) + { + vertices_dest[i].x = 10000.0f; + vertices_dest[i].y = 10000.0f; + vertices_dest[i].z = 10000.0f; + } + + hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + for (i = 0; i < 4; i++) + { + ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", + i, vertices_dest[i*2].x, vertices_ref[i*2].x); + ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", + i, vertices_dest[i*2].y, vertices_ref[i*2].y); + ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", + i, vertices_dest[i*2].z, vertices_ref[i*2].z); + ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", + i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); + ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", + i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); + ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", + i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); + } + skin_info->lpVtbl->Release(skin_info); +} + static void test_convert_adjacency_to_point_reps(void) { HRESULT hr; @@ -11540,6 +11622,7 @@ START_TEST(mesh) D3DXGenerateAdjacencyTest(); test_update_semantics(); test_create_skin_info(); + test_update_skinned_mesh(); test_convert_adjacency_to_point_reps(); test_convert_point_reps_to_adjacency(); test_weld_vertices(); diff --git a/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff b/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff new file mode 100644 index 00000000000..32962427aa8 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff @@ -0,0 +1,206 @@ +diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c +index ffc89f0..0fea1ac 100644 +--- a/dll/directx/wine/d3dx9_36/skin.c ++++ b/dll/directx/wine/d3dx9_36/skin.c +@@ -2,6 +2,7 @@ + * Skin Info operations specific to D3DX9. + * + * Copyright (C) 2011 Dylan Smith ++ * Copyright (C) 2013 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -399,10 +400,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, + static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, + const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) + { +- FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", +- iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); ++ DWORD size = D3DXGetFVFVertexSize(skin->fvf); ++ DWORD i, j; + +- return E_NOTIMPL; ++ TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", ++ skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ ++ if (bone_inv_transpose_transforms) ++ FIXME("Skinning vertices with two position elements not supported\n"); ++ ++ if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { ++ FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); ++ return E_FAIL; ++ } ++ ++ /* Reset all positions */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); ++ position->x = 0.0f; ++ position->y = 0.0f; ++ position->z = 0.0f; ++ } ++ ++ /* Update positions that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); ++ D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 position; ++ D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); ++ D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformCoord(&position, position_src, &matrix); ++ position_dest->x += weight * position.x; ++ position_dest->y += weight * position.y; ++ position_dest->z += weight * position.z; ++ } ++ } ++ ++ if (skin->fvf & D3DFVF_NORMAL) { ++ /* Reset all normals */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); ++ normal->x = 0.0f; ++ normal->y = 0.0f; ++ normal->z = 0.0f; ++ } ++ ++ /* Update normals that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 normal; ++ D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); ++ D3DXVec3TransformNormal(&normal, &normal, &matrix); ++ normal_dest->x += weight * normal.x; ++ normal_dest->y += weight * normal.y; ++ normal_dest->z += weight * normal.z; ++ } ++ } ++ ++ /* Normalize all normals that are influenced by bones*/ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); ++ if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) ++ D3DXVec3Normalize(normal_dest, normal_dest); ++ } ++ } ++ ++ return D3D_OK; + } + + static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index e46e38d..78f95a6 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -5265,6 +5265,88 @@ static void test_create_skin_info(void) + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + } + ++static void test_update_skinned_mesh(void) ++{ ++ static DWORD bone0_vertices[2] = { 1, 3 }; ++ static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; ++ static DWORD bone1_vertices[2] = { 2, 3 }; ++ static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; ++ static D3DMATRIX bones_matrix[2] = ++ { { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ 2.0f, 2.0f, 4.0f, 1.0f ++ } } }, ++ { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ -4.0f, -4.0f, 4.0f, 1.0f ++ } } } }; ++ static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, ++ { 1.0f, 0.0f, 0.0f }, ++ { 1.0f, 1.0f, -1.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -1.0f, -1.0f, 1.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -1.0f, -1.0f, -1.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, ++ { 0.0f, 0.0f, 0.0f }, ++ { 3.0f, 3.0f, 3.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -5.0f, -5.0f, 5.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -2.0f, -2.0f, 3.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ D3DVECTOR vertices_dest[8]; ++ HRESULT hr; ++ ID3DXSkinInfo *skin_info; ++ D3DXMATRIX matrix; ++ int i; ++ ++ D3DXMatrixIdentity(&matrix); ++ for (i = 0; i < 8; i++) ++ { ++ vertices_dest[i].x = 10000.0f; ++ vertices_dest[i].y = 10000.0f; ++ vertices_dest[i].z = 10000.0f; ++ } ++ ++ hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ for (i = 0; i < 4; i++) ++ { ++ ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", ++ i, vertices_dest[i*2].x, vertices_ref[i*2].x); ++ ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", ++ i, vertices_dest[i*2].y, vertices_ref[i*2].y); ++ ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", ++ i, vertices_dest[i*2].z, vertices_ref[i*2].z); ++ ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); ++ ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); ++ ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); ++ } ++ skin_info->lpVtbl->Release(skin_info); ++} ++ + static void test_convert_adjacency_to_point_reps(void) + { + HRESULT hr; +@@ -11509,6 +11591,7 @@ START_TEST(mesh) + D3DXGenerateAdjacencyTest(); + test_update_semantics(); + test_create_skin_info(); ++ test_update_skinned_mesh(); + test_convert_adjacency_to_point_reps(); + test_convert_point_reps_to_adjacency(); + test_weld_vertices();

3 years, 10 months

[reactos] 215/218: [WINESYNC] d3dx9_36: Filter out D3DCompile warning messages that are not present with D3DCompileShader. (try 4)

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=489e520163b6ae3ab83d7… commit 489e520163b6ae3ab83d77290ff70b4a3a2de7c3 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Filter out D3DCompile warning messages that are not present with D3DCompileShader. (try 4) This patch fixes vertex processing issue of bug 33770. The problem comes from the fact that even if the call succeeds, the game interprets a non null error_messages pointer as an error. By calling D3DCompile we use a newer version of the compiler which is more strict and generates the following warning. - warning X3206: 'dot': implicit truncation of vector type - warning X3206: implicit truncation of vector type - warning X3206: 'mul': implicit truncation of vector type D3DCompileShader does not generate such warnings. These is confirmed in the DX SDK release note: New Warning X3206: Implicit Truncation of Vector Type Beginning in the August 2009 release of the DirectX SDK, the compiler will warn when an implicit truncation of a vector type occurs. The warnings cannot be disable so this patch filters out these strings in D3DCompileShader and reset the error messages pointer if the resulting buffer is empty. Try 2: - only filter out lines containing "X3206:" in case d3dcompiler_43 has localization Try 3: - use move in place instead of copying the buffer Try 4: - filter simplification by Sebastian and remove 'mul' testing left-out in search string wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/shader.c | 35 ++++++++++++++++ ...not_present_with_D3DCompileShader._(try_4).diff | 46 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c index c54bacc364b..ce9d8aef596 100644 --- a/dll/directx/wine/d3dx9_36/shader.c +++ b/dll/directx/wine/d3dx9_36/shader.c @@ -445,6 +445,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO } } + /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */ + if (SUCCEEDED(hr) && error_msgs && *error_msgs) + { + char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs); + DWORD size = ID3DXBuffer_GetBufferSize(*error_msgs); + + /* Ensure messages are null terminated for safe processing */ + if (size) messages[size - 1] = 0; + + while (size > 1) + { + char *prev, *next; + + /* Warning has the form "warning X3206: ... implicit truncation of vector type" + but we only search for "X3206:" in case d3dcompiler_43 has localization */ + prev = next = strstr(messages, "X3206:"); + if (!prev) break; + + /* get pointer to beginning and end of current line */ + while (prev > messages && *(prev - 1) != '\n') prev--; + while (next < messages + size - 1 && *next != '\n') next++; + if (next < messages + size - 1 && *next == '\n') next++; + + memmove(prev, next, messages + size - next); + size -= (next - prev); + } + + /* Only return a buffer if the resulting string is not empty as some apps depend on that */ + if (size <= 1) + { + ID3DXBuffer_Release(*error_msgs); + *error_msgs = NULL; + } + } + return hr; } diff --git a/sdk/tools/winesync/d3dx9_staging/0012-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff b/sdk/tools/winesync/d3dx9_staging/0012-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff new file mode 100644 index 00000000000..9ea5f15bb64 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0012-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff @@ -0,0 +1,46 @@ +diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c +index 1c6acc8..3e0d922 100644 +--- a/dll/directx/wine/d3dx9_36/shader.c ++++ b/dll/directx/wine/d3dx9_36/shader.c +@@ -441,6 +441,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO + } + } + ++ /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */ ++ if (SUCCEEDED(hr) && error_msgs && *error_msgs) ++ { ++ char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs); ++ DWORD size = ID3DXBuffer_GetBufferSize(*error_msgs); ++ ++ /* Ensure messages are null terminated for safe processing */ ++ if (size) messages[size - 1] = 0; ++ ++ while (size > 1) ++ { ++ char *prev, *next; ++ ++ /* Warning has the form "warning X3206: ... implicit truncation of vector type" ++ but we only search for "X3206:" in case d3dcompiler_43 has localization */ ++ prev = next = strstr(messages, "X3206:"); ++ if (!prev) break; ++ ++ /* get pointer to beginning and end of current line */ ++ while (prev > messages && *(prev - 1) != '\n') prev--; ++ while (next < messages + size - 1 && *next != '\n') next++; ++ if (next < messages + size - 1 && *next == '\n') next++; ++ ++ memmove(prev, next, messages + size - next); ++ size -= (next - prev); ++ } ++ ++ /* Only return a buffer if the resulting string is not empty as some apps depend on that */ ++ if (size <= 1) ++ { ++ ID3DXBuffer_Release(*error_msgs); ++ *error_msgs = NULL; ++ } ++ } ++ + return hr; + } +

3 years, 10 months

[reactos] 214/218: [WINESYNC] d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a7364d0ad475b31dd9fc… commit 7a7364d0ad475b31dd9fc7350ae283dffcfd8b47 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/d3dx9_private.h | 2 + dll/directx/wine/d3dx9_36/surface.c | 62 +++++++++++++ dll/directx/wine/d3dx9_36/texture.c | 5 +- ...eToFile_to_save_simple_texture_to_dds_file.diff | 102 +++++++++++++++++++++ 4 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h index 66c93d26e84..741ec3e9747 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h @@ -126,6 +126,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, + const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN; unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index d1b13b7d0dc..22f21182031 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -654,6 +654,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur return D3D_OK; } +static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex, + int face, UINT level, struct IDirect3DSurface9 **surf) +{ + switch (type) + { + case D3DRTYPE_TEXTURE: + return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf); + case D3DRTYPE_CUBETEXTURE: + return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf); + default: + ERR("Unexpected texture type\n"); + return E_NOTIMPL; + } +} + +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) +{ + HRESULT hr; + D3DRESOURCETYPE type; + UINT mip_levels; + IDirect3DSurface9 *surface; + + type = IDirect3DBaseTexture9_GetType(src_texture); + + if ((type != D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE)) + return D3DERR_INVALIDCALL; + + if (type == D3DRTYPE_CUBETEXTURE) + { + FIXME("Cube texture not supported yet\n"); + return E_NOTIMPL; + } + else if (type == D3DRTYPE_VOLUMETEXTURE) + { + FIXME("Volume texture not supported yet\n"); + return E_NOTIMPL; + } + + mip_levels = IDirect3DTexture9_GetLevelCount(src_texture); + + if (mip_levels > 1) + { + FIXME("Mipmap not supported yet\n"); + return E_NOTIMPL; + } + + if (src_palette) + { + FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); + return E_NOTIMPL; + } + + hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + + if (SUCCEEDED(hr)) + { + hr = save_dds_surface_to_memory(dst_buffer, surface, NULL); + IDirect3DSurface9_Release(surface); + } + + return hr; +} HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c index 055a68ad305..92efe5694f9 100644 --- a/dll/directx/wine/d3dx9_36/texture.c +++ b/dll/directx/wine/d3dx9_36/texture.c @@ -1899,10 +1899,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; if (file_format == D3DXIFF_DDS) - { - FIXME("DDS file format isn't supported yet\n"); - return E_NOTIMPL; - } + return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette); type = IDirect3DBaseTexture9_GetType(src_texture); switch (type) diff --git a/sdk/tools/winesync/d3dx9_staging/0011-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff b/sdk/tools/winesync/d3dx9_staging/0011-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff new file mode 100644 index 00000000000..00b13d26048 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0011-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff @@ -0,0 +1,102 @@ +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h +index c3308b0..20ca848 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h ++++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h +@@ -126,6 +126,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO + IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; + HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, + IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; ++HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, ++ const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN; + + unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; + float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; +diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c +index 8e2f2a2..4e391f7 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -650,6 +650,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur + return D3D_OK; + } + ++static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex, ++ int face, UINT level, struct IDirect3DSurface9 **surf) ++{ ++ switch (type) ++ { ++ case D3DRTYPE_TEXTURE: ++ return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf); ++ case D3DRTYPE_CUBETEXTURE: ++ return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf); ++ default: ++ ERR("Unexpected texture type\n"); ++ return E_NOTIMPL; ++ } ++} ++ ++HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) ++{ ++ HRESULT hr; ++ D3DRESOURCETYPE type; ++ UINT mip_levels; ++ IDirect3DSurface9 *surface; ++ ++ type = IDirect3DBaseTexture9_GetType(src_texture); ++ ++ if ((type != D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE)) ++ return D3DERR_INVALIDCALL; ++ ++ if (type == D3DRTYPE_CUBETEXTURE) ++ { ++ FIXME("Cube texture not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ else if (type == D3DRTYPE_VOLUMETEXTURE) ++ { ++ FIXME("Volume texture not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ mip_levels = IDirect3DTexture9_GetLevelCount(src_texture); ++ ++ if (mip_levels > 1) ++ { ++ FIXME("Mipmap not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ if (src_palette) ++ { ++ FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); ++ ++ if (SUCCEEDED(hr)) ++ { ++ hr = save_dds_surface_to_memory(dst_buffer, surface, NULL); ++ IDirect3DSurface9_Release(surface); ++ } ++ ++ return hr; ++} + HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, + const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, + const D3DXIMAGE_INFO *src_info) +diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c +index 6af4458..635982d 100644 +--- a/dll/directx/wine/d3dx9_36/texture.c ++++ b/dll/directx/wine/d3dx9_36/texture.c +@@ -1895,10 +1895,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE + if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; + + if (file_format == D3DXIFF_DDS) +- { +- FIXME("DDS file format isn't supported yet\n"); +- return E_NOTIMPL; +- } ++ return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette); + + type = IDirect3DBaseTexture9_GetType(src_texture); + switch (type)

3 years, 10 months

[reactos] 213/218: [WINESYNC] d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959c06f9b33de6d31845c… commit 959c06f9b33de6d31845cf9feeae0413a7c69b5e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/surface.c | 8 ++++++++ ..._FOURCC_surface_to_save_dds_surface_to_memory.diff | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index 30d04684044..d1b13b7d0dc 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -437,6 +437,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form } } + /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */ + if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN) + { + pixel_format->flags |= DDS_PF_FOURCC; + pixel_format->fourcc = d3dformat; + return D3D_OK; + } + WARN("Unknown pixel format %#x\n", d3dformat); return E_NOTIMPL; } diff --git a/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff new file mode 100644 index 00000000000..868fe7ce8ab --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff @@ -0,0 +1,19 @@ +diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c +index ebec81f..8e2f2a2 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form + } + } + ++ /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */ ++ if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN) ++ { ++ pixel_format->flags |= DDS_PF_FOURCC; ++ pixel_format->fourcc = d3dformat; ++ return D3D_OK; ++ } ++ + WARN("Unknown pixel format %#x\n", d3dformat); + return E_NOTIMPL; + }

3 years, 10 months

[reactos] 212/218: [WINESYNC] d3dx9: Implement D3DXComputeTangent

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=181ffe077911b915d3d89… commit 181ffe077911b915d3d89ac2621d942a6050b45d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9: Implement D3DXComputeTangent Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wine-staging patch by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/mesh.c | 18 ++ dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- .../0009-d3dx9__Implement_D3DXComputeTangent.diff | 289 +++++++++++++++++++++ 22 files changed, 327 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index 3a043da3cf4..b171d8e878c 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 1a324b611c1..395430227f9 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index 95cc814c497..2a7719c7f44 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index 95cc814c497..2a7719c7f44 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index b258cbab493..6b5912f41b8 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index b258cbab493..6b5912f41b8 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index 19871f33abc..3db50029c3a 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index 38714f68127..17f380f6d05 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index ed8efad9c6c..1de72897d28 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index ed8efad9c6c..1de72897d28 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index ed8efad9c6c..1de72897d28 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index ed8efad9c6c..1de72897d28 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index c76cf2d9517..699c84c5d4d 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7539,6 +7539,24 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangent (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, + DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) +{ + TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", + mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); + + return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, + ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, + binorm_idx, + ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, + tangent_idx, D3DX_DEFAULT, 0, + ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index 13405ad8909..5bf7f675ee9 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 1f4cf67c7b2..69558e0b255 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 1f4cf67c7b2..69558e0b255 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -24,7 +24,7 @@ @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/sdk/tools/winesync/d3dx9_staging/0009-d3dx9__Implement_D3DXComputeTangent.diff b/sdk/tools/winesync/d3dx9_staging/0009-d3dx9__Implement_D3DXComputeTangent.diff new file mode 100644 index 00000000000..b79bd4a0f61 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0009-d3dx9__Implement_D3DXComputeTangent.diff @@ -0,0 +1,289 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index d96ad37..9124937 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -20,7 +20,7 @@ + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index 8979d23..50c0db0 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -20,7 +20,7 @@ + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index 326263a..427261c 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index 326263a..427261c 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index a75eb74..a1e6fe1 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index a75eb74..a1e6fe1 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index 19871f3..3db5002 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index 38714f6..17f380f 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index ed8efad..1de7289 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index ed8efad..1de7289 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index ed8efad..1de7289 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index ed8efad..1de7289 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index b07809e..c378ed0 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index 3aae0f1..a5c701a 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7535,6 +7535,24 @@ done: + } + + /************************************************************************* ++ * D3DXComputeTangent (D3DX9_36.@) ++ */ ++HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, ++ DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) ++{ ++ TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", ++ mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); ++ ++ return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, ++ ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, ++ binorm_idx, ++ ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, ++ tangent_idx, D3DX_DEFAULT, 0, ++ ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, ++ adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); ++} ++ ++/************************************************************************* + * D3DXComputeNormals (D3DX9_36.@) + */ + HRESULT WINAPI D3DXComputeNormals(struct ID3DXBaseMesh *mesh, const DWORD *adjacency) +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index 13405ad..5bf7f67 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index 13405ad..5bf7f67 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index 13405ad..5bf7f67 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index 13405ad..5bf7f67 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index 13405ad..5bf7f67 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index 1f4cf67..69558e0 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index 1f4cf67..69558e0 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -24,7 +24,7 @@ + @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)

3 years, 10 months

[reactos] 211/218: [WINESYNC] d3dx9_*: Add D3DXSHProjectCubeMap stub

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1dfb089b4b624b5f17895… commit 1dfb089b4b624b5f17895a88c4abdff589b5d233 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_*: Add D3DXSHProjectCubeMap stub Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284 wine-staging patch by Andrey Gusev <andrey.goosev(a)gmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/math.c | 14 + dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- sdk/include/dxsdk/d3dx9math.h | 1 + ...008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff | 297 +++++++++++++++++++++ 23 files changed, 332 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index a45af880b61..3a043da3cf4 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 34c31eb7cc2..1a324b611c1 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index f07c188a398..95cc814c497 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index f07c188a398..95cc814c497 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index 77454081317..b258cbab493 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index 77454081317..b258cbab493 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index 72418ac59ab..19871f33abc 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index 12db9be10fc..38714f68127 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -262,7 +262,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index 4e85b4ca2f3..ed8efad9c6c 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index 4e85b4ca2f3..ed8efad9c6c 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index 4e85b4ca2f3..ed8efad9c6c 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index 4e85b4ca2f3..ed8efad9c6c 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c index cdc55feb64f..a575d659fca 100644 --- a/dll/directx/wine/d3dx9_36/math.c +++ b/dll/directx/wine/d3dx9_36/math.c @@ -2973,6 +2973,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; } +HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout) +{ + FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout); + + if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER) + return D3DERR_INVALIDCALL; + + *rout = 0.0f; + *gout = 0.0f; + *bout = 0.0f; + + return D3D_OK; +} + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in) { FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index b07809e646c..13405ad8909 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 288ab27dd5d..1f4cf67c7b2 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -262,7 +262,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 288ab27dd5d..1f4cf67c7b2 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -262,7 +262,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/sdk/include/dxsdk/d3dx9math.h b/sdk/include/dxsdk/d3dx9math.h index 2c41b73d423..7aed21e3ee3 100644 --- a/sdk/include/dxsdk/d3dx9math.h +++ b/sdk/include/dxsdk/d3dx9math.h @@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); +HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout); FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale); diff --git a/sdk/tools/winesync/d3dx9_staging/0008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff new file mode 100644 index 00000000000..aaa82150343 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff @@ -0,0 +1,297 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index a45af880b61..3a043da3cf4 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -256,7 +256,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index 34c31eb7cc2..1a324b611c1 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -256,7 +256,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index f07c188a398..95cc814c497 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -260,7 +260,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index f07c188a398..95cc814c497 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -260,7 +260,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index 77454081317..b258cbab493 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index 77454081317..b258cbab493 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index 72418ac59ab..19871f33abc 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index 12db9be10fc..38714f68127 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -262,7 +262,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index 4e85b4ca2f3..ed8efad9c6c 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -267,7 +267,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index 4e85b4ca2f3..ed8efad9c6c 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -267,7 +267,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index 4e85b4ca2f3..ed8efad9c6c 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -267,7 +267,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index 4e85b4ca2f3..ed8efad9c6c 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -267,7 +267,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c +index cdc55feb64f..a575d659fca 100644 +--- a/dll/directx/wine/d3dx9_36/math.c ++++ b/dll/directx/wine/d3dx9_36/math.c +@@ -2973,6 +2973,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) + out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; + } + ++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout) ++{ ++ FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout); ++ ++ if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER) ++ return D3DERR_INVALIDCALL; ++ ++ *rout = 0.0f; ++ *gout = 0.0f; ++ *bout = 0.0f; ++ ++ return D3D_OK; ++} ++ + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in) + { + FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index b07809e646c..13405ad8909 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -269,7 +269,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index 288ab27dd5d..1f4cf67c7b2 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -262,7 +262,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index 288ab27dd5d..1f4cf67c7b2 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -262,7 +262,7 @@ + @ stub D3DXSHMultiply6(ptr ptr ptr) + @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/sdk/include/dxsdk/d3dx9math.h b/sdk/include/dxsdk/d3dx9math.h +index 2c41b73d423..7aed21e3ee3 100644 +--- a/sdk/include/dxsdk/d3dx9math.h ++++ b/sdk/include/dxsdk/d3dx9math.h +@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA + FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); + FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); + FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); ++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout); + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); + FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); + FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);

3 years, 10 months

[reactos] 210/218: [WINESYNC] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5687b2200589d20f3deb4… commit 5687b2200589d20f3deb4a711d3e95248ed809a9 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Add semi-stub for D3DXOptimizeVertices. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/mesh.c | 27 ++ dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- modules/rostests/winetests/d3dx9_36/mesh.c | 22 ++ ...36__Add_semi-stub_for_D3DXOptimizeVertices.diff | 338 +++++++++++++++++++++ 23 files changed, 407 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index 570ef6fcaa7..a45af880b61 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 6b650b2bd8d..34c31eb7cc2 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index 7c2d8b0919c..f07c188a398 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index 7c2d8b0919c..f07c188a398 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index 7431d7afe66..77454081317 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index 7431d7afe66..77454081317 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index 06ced20df61..72418ac59ab 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index c9aca309a35..12db9be10fc 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index f541f6f2ef1..4e85b4ca2f3 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index f541f6f2ef1..4e85b4ca2f3 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index f541f6f2ef1..4e85b4ca2f3 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index f541f6f2ef1..4e85b4ca2f3 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index e2265ed6aed..c76cf2d9517 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7189,6 +7189,33 @@ cleanup: return hr; } + +/************************************************************************* + * D3DXOptimizeVertices (D3DX9_36.@) + */ +HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, + UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) +{ + UINT i; + + FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", + indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); + + if (!vertex_remap) + { + WARN("vertex remap pointer is NULL.\n"); + return D3DERR_INVALIDCALL; + } + + for (i = 0; i < num_vertices; i++) + { + vertex_remap[i] = i; + } + + return D3D_OK; +} + + /************************************************************************* * D3DXOptimizeFaces (D3DX9_36.@) * diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index e1f44261610..b07809e646c 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 0851945d36b..288ab27dd5d 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -222,7 +222,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 0851945d36b..288ab27dd5d 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -222,7 +222,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index aa486bc14e6..3118a7d443f 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -10436,6 +10436,27 @@ cleanup: free_test_context(test_context); } +static void test_optimize_vertices(void) +{ + HRESULT hr; + DWORD vertex_remap[3]; + const DWORD indices[] = {0, 1, 2}; + const UINT num_faces = 1; + const UINT num_vertices = 3; + + hr = D3DXOptimizeVertices(indices, num_faces, + num_vertices, FALSE, + vertex_remap); + ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %x, expected D3D_OK.\n", hr); + + /* vertex_remap must not be NULL */ + hr = D3DXOptimizeVertices(indices, num_faces, + num_vertices, FALSE, + NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap " + "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); +} + static void test_optimize_faces(void) { HRESULT hr; @@ -11524,6 +11545,7 @@ START_TEST(mesh) test_weld_vertices(); test_clone_mesh(); test_valid_mesh(); + test_optimize_vertices(); test_optimize_faces(); test_compute_normals(); test_D3DXFrameFind(); diff --git a/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff new file mode 100644 index 00000000000..cfef8f95731 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff @@ -0,0 +1,338 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index fe8140d..a6eef88 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -226,7 +226,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index cb40277..eac8da0 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -226,7 +226,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index bfad690..87ecda2 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index bfad690..87ecda2 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index 6022854..c4ac4e3 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index 6022854..c4ac4e3 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index 06ced20..72418ac 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index c9aca30..12db9be 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index f541f6f..4e85b4c 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index f541f6f..4e85b4c 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index f541f6f..4e85b4c 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index f541f6f..4e85b4c 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index 8f7c926..3aae0f1 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7184,6 +7184,33 @@ cleanup: + return hr; + } + ++ ++/************************************************************************* ++ * D3DXOptimizeVertices (D3DX9_36.@) ++ */ ++HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, ++ UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) ++{ ++ UINT i; ++ ++ FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", ++ indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); ++ ++ if (!vertex_remap) ++ { ++ WARN("vertex remap pointer is NULL.\n"); ++ return D3DERR_INVALIDCALL; ++ } ++ ++ for (i = 0; i < num_vertices; i++) ++ { ++ vertex_remap[i] = i; ++ } ++ ++ return D3D_OK; ++} ++ ++ + /************************************************************************* + * D3DXOptimizeFaces (D3DX9_36.@) + * +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index 42deb32..e46e38d 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -10405,6 +10405,27 @@ cleanup: + free_test_context(test_context); + } + ++static void test_optimize_vertices(void) ++{ ++ HRESULT hr; ++ DWORD vertex_remap[3]; ++ const DWORD indices[] = {0, 1, 2}; ++ const UINT num_faces = 1; ++ const UINT num_vertices = 3; ++ ++ hr = D3DXOptimizeVertices(indices, num_faces, ++ num_vertices, FALSE, ++ vertex_remap); ++ ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %x, expected D3D_OK.\n", hr); ++ ++ /* vertex_remap must not be NULL */ ++ hr = D3DXOptimizeVertices(indices, num_faces, ++ num_vertices, FALSE, ++ NULL); ++ ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap " ++ "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); ++} ++ + static void test_optimize_faces(void) + { + HRESULT hr; +@@ -11493,6 +11514,7 @@ START_TEST(mesh) + test_weld_vertices(); + test_clone_mesh(); + test_valid_mesh(); ++ test_optimize_vertices(); + test_optimize_faces(); + test_compute_normals(); + test_D3DXFrameFind(); +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index e1f4426..b07809e 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index 0851945..288ab27 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -222,7 +222,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index 0851945..288ab27 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -222,7 +222,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)

3 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2021