Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 61/74: [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=6e7150ee67bd0d8e41a48… commit 6e7150ee67bd0d8e41a48999dc255d9334082b9e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Wed Feb 5 22:11:38 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +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 01729ea9a60..185d4f44c0d 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -395,6 +395,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/0012-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff b/sdk/tools/winesync/d3dx9_staging/0012-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff new file mode 100644 index 00000000000..b1a114bf1b1 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0012-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 01729ea..185d4f4 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -395,6 +395,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; + }

4 years, 7 months

[reactos] 60/74: [WINESYNC] d3dx9: Implement D3DXComputeTangent

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ba697c68b28b18d53f74… commit 5ba697c68b28b18d53f74f63577762e201c62afb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Wed Feb 5 21:51:59 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +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 +- .../0011-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 ad3ea3a036e..3cf044c10e9 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) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 b54a8e16d10..f311bbf1e13 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) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 03542f07aae..aa560e4ea9e 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 03542f07aae..aa560e4ea9e 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 b470fb33606..fb57152b97b 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 b470fb33606..fb57152b97b 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 e90185a5b7d..129e2a049ce 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 b926ad5e085..2e4456a41c3 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 a392a5b5c1b..2a9ee0627c0 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7536,6 +7536,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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3a681e3edfa..c1f0104d978 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -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 3a681e3edfa..c1f0104d978 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/sdk/tools/winesync/d3dx9_staging/0011-d3dx9__Implement_D3DXComputeTangent.diff b/sdk/tools/winesync/d3dx9_staging/0011-d3dx9__Implement_D3DXComputeTangent.diff new file mode 100644 index 00000000000..2849edc8155 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0011-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 ad3ea3a0..3cf044c1 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) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 b54a8e16..f311bbf1 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) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 03542f07..aa560e4e 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 03542f07..aa560e4e 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 b470fb33..fb57152b 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 b470fb33..fb57152b 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 e90185a5..129e2a04 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 b926ad5e..2e4456a4 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 a392a5b5..2a9ee062 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7536,6 +7536,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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3a681e3e..c1f0104d 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -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 3a681e3e..c1f0104d 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)

4 years, 7 months

[reactos] 59/74: [WINESYNC] d3dx9_*: Add D3DXSHProjectCubeMap stub

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e131c1834dd7244d7baea… commit e131c1834dd7244d7baeaf167aeafbf852be0825 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:09:04 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +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 + ...010-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 b7d81740428..ad3ea3a036e 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 9a86cb84754..b54a8e16d10 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 85d2c3408b3..03542f07aae 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 85d2c3408b3..03542f07aae 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 95b6bc510f1..b470fb33606 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 95b6bc510f1..b470fb33606 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 ed6cb55e75b..e90185a5b7d 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 ecd12b659d4..b926ad5e085 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) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 08e51b765e7..976610c15e9 100644 --- a/dll/directx/wine/d3dx9_36/math.c +++ b/dll/directx/wine/d3dx9_36/math.c @@ -2969,6 +2969,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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 f4e70364e9b..3a681e3edfa 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -262,7 +262,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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 f4e70364e9b..3a681e3edfa 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -262,7 +262,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -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/0010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff new file mode 100644 index 00000000000..322d9f16dff --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0010-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 b7d81740..ad3ea3a0 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 9a86cb84..b54a8e16 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 85d2c340..03542f07 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 85d2c340..03542f07 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 95b6bc51..b470fb33 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 95b6bc51..b470fb33 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 ed6cb55e..e90185a5 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 ecd12b65..b926ad5e 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) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 08e51b76..976610c1 100644 +--- a/dll/directx/wine/d3dx9_36/math.c ++++ b/dll/directx/wine/d3dx9_36/math.c +@@ -2969,6 +2969,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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 f4e70364..3a681e3e 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -262,7 +262,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 f4e70364..3a681e3e 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -262,7 +262,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -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 2c41b73d..7aed21e3 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);

4 years, 7 months

[reactos] 58/74: [WINESYNC] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54e07d18d588a96bfcfdd… commit 54e07d18d588a96bfcfdd1481f7039b468550b3d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +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 d4e741884b9..b7d81740428 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) -@ stdcall -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 5375c07690a..9a86cb84754 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) -@ stdcall -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 c17f97f04a9..85d2c3408b3 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) -@ stdcall -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 c17f97f04a9..85d2c3408b3 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) -@ stdcall -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 5b267c14599..95b6bc510f1 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) -@ stdcall -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 5b267c14599..95b6bc510f1 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) -@ stdcall -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 dc9ea939416..ed6cb55e75b 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) -@ stdcall -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 4dec8f58d0d..ecd12b659d4 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) -@ stdcall -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 7b6d62df3e7..3e5fb3f301f 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) -@ stdcall -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 7b6d62df3e7..3e5fb3f301f 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) -@ stdcall -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 7b6d62df3e7..3e5fb3f301f 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) -@ stdcall -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 7b6d62df3e7..3e5fb3f301f 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) -@ stdcall -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 692321d9065..544b744b2b8 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) -@ stdcall -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 acbb2477670..a392a5b5c1b 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7186,6 +7186,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 692321d9065..544b744b2b8 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) -@ stdcall -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 692321d9065..544b744b2b8 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) -@ stdcall -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 692321d9065..544b744b2b8 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) -@ stdcall -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 692321d9065..544b744b2b8 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) -@ stdcall -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 692321d9065..544b744b2b8 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) -@ stdcall -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 936ae902dea..f4e70364e9b 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) -@ stdcall -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 936ae902dea..f4e70364e9b 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) -@ stdcall -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 19e8b8e334e..176f06c56cd 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -10362,6 +10362,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; @@ -11250,6 +11271,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/0009-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff b/sdk/tools/winesync/d3dx9_staging/0009-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff new file mode 100644 index 00000000000..28ad91ab339 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0009-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 d4e74188..b7d81740 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) +-@ stdcall -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 5375c076..9a86cb84 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) +-@ stdcall -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 c17f97f0..85d2c340 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) +-@ stdcall -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 c17f97f0..85d2c340 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) +-@ stdcall -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 5b267c14..95b6bc51 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) +-@ stdcall -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 5b267c14..95b6bc51 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) +-@ stdcall -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 dc9ea939..ed6cb55e 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) +-@ stdcall -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 4dec8f58..ecd12b65 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) +-@ stdcall -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 7b6d62df..3e5fb3f3 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) +-@ stdcall -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 7b6d62df..3e5fb3f3 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) +-@ stdcall -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 7b6d62df..3e5fb3f3 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) +-@ stdcall -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 7b6d62df..3e5fb3f3 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) +-@ stdcall -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 692321d9..544b744b 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) +-@ stdcall -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 acbb2477..a392a5b5 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7186,6 +7186,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 692321d9..544b744b 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) +-@ stdcall -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 692321d9..544b744b 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) +-@ stdcall -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 692321d9..544b744b 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) +-@ stdcall -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 692321d9..544b744b 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) +-@ stdcall -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 692321d9..544b744b 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) +-@ stdcall -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 936ae902..f4e70364 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) +-@ stdcall -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 936ae902..f4e70364 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) +-@ stdcall -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 5cb000a5..904a4524 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -10331,6 +10331,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; +@@ -11219,6 +11240,7 @@ START_TEST(mesh) + test_weld_vertices(); + test_clone_mesh(); + test_valid_mesh(); ++ test_optimize_vertices(); + test_optimize_faces(); + test_compute_normals(); + test_D3DXFrameFind();

4 years, 7 months

[reactos] 57/74: [WINESYNC] d3dx9_36/tests: Remove useless \n within some ok messages.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2420da1158f73e648f6b1… commit 2420da1158f73e648f6b1bc912967f87bc11d817 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:28 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36/tests: Remove useless \n within some ok messages. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- modules/rostests/winetests/d3dx9_36/mesh.c | 12 ++--- ..._Remove_useless__n_within_some_ok_messages.diff | 52 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 1b0f86ef170..19e8b8e334e 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -10154,10 +10154,10 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, test_context->device, &mesh_clone); - ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\n", i, hr); hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); - ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr); /* Check declaration elements */ for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { @@ -10344,7 +10344,7 @@ static void test_valid_mesh(void) hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " - "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); + "Got %x, expected %x.\n", i, hr, tc[i].exp_hr); /* Note errors_and_warnings is deliberately not checked because that * would require copying wast amounts of the text output. */ @@ -10488,7 +10488,7 @@ static void test_optimize_faces(void) tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK\n", i, hr); + "Got %x, expected D3D_OK.\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++) @@ -10506,14 +10506,14 @@ static void test_optimize_faces(void) tc[0].num_vertices, tc[0].indices_are_32bit, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " - "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); /* Number of faces must be smaller than 2^15 */ hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, tc[0].num_vertices, FALSE, &smallest_face_remap); ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " - "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr); } static HRESULT clear_normals(ID3DXMesh *mesh) diff --git a/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff new file mode 100644 index 00000000000..30ab30672a6 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff @@ -0,0 +1,52 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index 3fcd65f..5cb000a 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -10123,10 +10123,10 @@ static void test_clone_mesh(void) + + hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, + test_context->device, &mesh_clone); +- ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); ++ ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\n", i, hr); + + hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); +- ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); ++ ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr); + /* Check declaration elements */ + for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) + { +@@ -10313,7 +10313,7 @@ static void test_valid_mesh(void) + + hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); + todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " +- "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); ++ "Got %x, expected %x.\n", i, hr, tc[i].exp_hr); + + /* Note errors_and_warnings is deliberately not checked because that + * would require copying wast amounts of the text output. */ +@@ -10457,7 +10457,7 @@ static void test_optimize_faces(void) + tc[i].num_vertices, tc[i].indices_are_32bit, + face_remap); + ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " +- "Got %x\n, expected D3D_OK\n", i, hr); ++ "Got %x, expected D3D_OK.\n", i, hr); + + /* Compare face remap with expected face remap */ + for (j = 0; j < tc[i].num_faces; j++) +@@ -10475,14 +10475,14 @@ static void test_optimize_faces(void) + tc[0].num_vertices, tc[0].indices_are_32bit, + NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " +- "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); ++ "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); + + /* Number of faces must be smaller than 2^15 */ + hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, + tc[0].num_vertices, FALSE, + &smallest_face_remap); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " +- "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); ++ "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr); + } + + static HRESULT clear_normals(ID3DXMesh *mesh)

4 years, 7 months

[reactos] 56/74: [WINESYNC] d3dx9_36/tests: Add additional tests for special cases.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff68d200dafa07c6c0098… commit ff68d200dafa07c6c009887f9b77f7c11563f27c Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:27 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36/tests: Add additional tests for special cases. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- modules/rostests/winetests/d3dx9_36/shader.c | 163 ++++++++++++++++++ ...ts__Add_additional_tests_for_special_cases.diff | 188 +++++++++++++++++++++ 2 files changed, 351 insertions(+) diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c index 02675c65b53..0d7dcc34883 100644 --- a/modules/rostests/winetests/d3dx9_36/shader.c +++ b/modules/rostests/winetests/d3dx9_36/shader.c @@ -6575,6 +6575,60 @@ static void test_shader_semantics(void) } } +static const DWORD ps_tex[] = { + 0xffff0103, /* ps_1_3 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texld_1_4[] = { + 0xffff0104, /* ps_1_4 */ + 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texld_2_0[] = { + 0xffff0200, /* ps_2_0 */ + 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0, c0, c1 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texcoord[] = { + 0xffff0103, /* ps_1_4 */ + 0x00000040, 0xb00f0000, /* texcoord t0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texcrd[] = { + 0xffff0104, /* ps_2_0 */ + 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_sincos_2_0[] = { + 0xffff0200, /* ps_2_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos t0, c0, c1, c2 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_sincos_3_0[] = { + 0xffff0300, /* ps_3_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD vs_sincos_2_0[] = { + 0xfffe0200, /* vs_2_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos a0, c0, c1, c2 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD vs_sincos_3_0[] = { + 0xfffe0300, /* vs_3_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos a0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + static void test_disassemble_shader(void) { static const char disasm_vs[] = " vs_1_1\n" @@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void) " dp3 r0, c1, c0\n" " mul r0, v0, r0\n" " mul r0, t0, r0\n"; + static const char disasm_ps_tex[] = " ps_1_3\n" + " tex t0\n" + " nop\n"; + static const char disasm_ps_texld_1_4[] = " ps_1_4\n" + " texld t0, c0\n" + " nop\n"; + static const char disasm_ps_texld_2_0[] = " ps_2_0\n" + " texld t0, c0, c1\n" + " nop\n"; + static const char disasm_ps_texcoord[] = " ps_1_3\n" + " texcoord t0\n" + " nop\n"; + static const char disasm_ps_texcrd[] = " ps_1_4\n" + " texcrd t0, c0\n" + " nop\n"; + static const char disasm_ps_sincos_2_0[] = " ps_2_0\n" + " sincos t0, c0, c1, c2\n" + " nop\n"; + static const char disasm_ps_sincos_3_0[] = " ps_3_0\n" + " sincos t0, c0\n" + " nop\n"; + static const char disasm_vs_sincos_2_0[] = " vs_2_0\n" + " sincos a0, c0, c1, c2\n" + " nop\n"; + static const char disasm_vs_sincos_3_0[] = " vs_3_0\n" + " sincos a0, c0\n" + " nop\n"; ID3DXBuffer *disassembly; HRESULT ret; char *ptr; @@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void) ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ "Returned '%s', expected '%s'\n", ptr, disasm_ps); ID3DXBuffer_Release(disassembly); + + /* Test tex instruction with pixel shader 1.3 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex); + ID3DXBuffer_Release(disassembly); + + /* Test texld instruction with pixel shader 1.4 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_1_4); + ID3DXBuffer_Release(disassembly); + + /* Test texld instruction with pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test texcoord instruction with pixel shader 1.3 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcoord); + ID3DXBuffer_Release(disassembly); + + /* Test texcrd instruction with pixel shader 1.4 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcrd); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 3.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_3_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 3.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_3_0); + ID3DXBuffer_Release(disassembly); + } START_TEST(shader) diff --git a/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff new file mode 100644 index 00000000000..fb56871fa5e --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff @@ -0,0 +1,188 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c +index 02675c6..0d7dcc3 100644 +--- a/modules/rostests/winetests/d3dx9_36/shader.c ++++ b/modules/rostests/winetests/d3dx9_36/shader.c +@@ -6575,6 +6575,60 @@ static void test_shader_semantics(void) + } + } + ++static const DWORD ps_tex[] = { ++ 0xffff0103, /* ps_1_3 */ ++ 0x00000042, 0xb00f0000, /* tex t0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texld_1_4[] = { ++ 0xffff0104, /* ps_1_4 */ ++ 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texld_2_0[] = { ++ 0xffff0200, /* ps_2_0 */ ++ 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0, c0, c1 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texcoord[] = { ++ 0xffff0103, /* ps_1_4 */ ++ 0x00000040, 0xb00f0000, /* texcoord t0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texcrd[] = { ++ 0xffff0104, /* ps_2_0 */ ++ 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_sincos_2_0[] = { ++ 0xffff0200, /* ps_2_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos t0, c0, c1, c2 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_sincos_3_0[] = { ++ 0xffff0300, /* ps_3_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD vs_sincos_2_0[] = { ++ 0xfffe0200, /* vs_2_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos a0, c0, c1, c2 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD vs_sincos_3_0[] = { ++ 0xfffe0300, /* vs_3_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos a0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ + static void test_disassemble_shader(void) + { + static const char disasm_vs[] = " vs_1_1\n" +@@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void) + " dp3 r0, c1, c0\n" + " mul r0, v0, r0\n" + " mul r0, t0, r0\n"; ++ static const char disasm_ps_tex[] = " ps_1_3\n" ++ " tex t0\n" ++ " nop\n"; ++ static const char disasm_ps_texld_1_4[] = " ps_1_4\n" ++ " texld t0, c0\n" ++ " nop\n"; ++ static const char disasm_ps_texld_2_0[] = " ps_2_0\n" ++ " texld t0, c0, c1\n" ++ " nop\n"; ++ static const char disasm_ps_texcoord[] = " ps_1_3\n" ++ " texcoord t0\n" ++ " nop\n"; ++ static const char disasm_ps_texcrd[] = " ps_1_4\n" ++ " texcrd t0, c0\n" ++ " nop\n"; ++ static const char disasm_ps_sincos_2_0[] = " ps_2_0\n" ++ " sincos t0, c0, c1, c2\n" ++ " nop\n"; ++ static const char disasm_ps_sincos_3_0[] = " ps_3_0\n" ++ " sincos t0, c0\n" ++ " nop\n"; ++ static const char disasm_vs_sincos_2_0[] = " vs_2_0\n" ++ " sincos a0, c0, c1, c2\n" ++ " nop\n"; ++ static const char disasm_vs_sincos_3_0[] = " vs_3_0\n" ++ " sincos a0, c0\n" ++ " nop\n"; + ID3DXBuffer *disassembly; + HRESULT ret; + char *ptr; +@@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void) + ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps); + ID3DXBuffer_Release(disassembly); ++ ++ /* Test tex instruction with pixel shader 1.3 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texld instruction with pixel shader 1.4 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_1_4); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texld instruction with pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texcoord instruction with pixel shader 1.3 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcoord); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texcrd instruction with pixel shader 1.4 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcrd); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 3.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_3_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 3.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_3_0); ++ ID3DXBuffer_Release(disassembly); ++ + } + + START_TEST(shader)

4 years, 7 months

[reactos] 55/74: [WINESYNC] d3dx9_36/tests: Add initial tests for D3DXDisassembleShader.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5676fb56338552ae8ac33… commit 5676fb56338552ae8ac332949fe65bf3d0a33b53 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:27 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36/tests: Add initial tests for D3DXDisassembleShader. wine-staging patch by Sebastian Lackner <sebastian(a)fds-team.de> --- modules/rostests/winetests/d3dx9_36/shader.c | 46 ++++++++++++++++ ...dd_initial_tests_for_D3DXDisassembleShader.diff | 62 ++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c index b67ffb209c4..02675c65b53 100644 --- a/modules/rostests/winetests/d3dx9_36/shader.c +++ b/modules/rostests/winetests/d3dx9_36/shader.c @@ -6575,6 +6575,51 @@ static void test_shader_semantics(void) } } +static void test_disassemble_shader(void) +{ + static const char disasm_vs[] = " vs_1_1\n" + " dcl_position v0\n" + " dp4 oPos.x, v0, c0\n" + " dp4 oPos.y, v0, c1\n" + " dp4 oPos.z, v0, c2\n" + " dp4 oPos.w, v0, c3\n"; + static const char disasm_ps[] = " ps_1_1\n" + " def c1, 1, 0, 0, 0\n" + " tex t0\n" + " dp3 r0, c1, c0\n" + " mul r0, v0, r0\n" + " mul r0, t0, r0\n"; + ID3DXBuffer *disassembly; + HRESULT ret; + char *ptr; + + /* Check wrong parameters */ + ret = D3DXDisassembleShader(NULL, FALSE, NULL, NULL); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + ret = D3DXDisassembleShader(NULL, FALSE, NULL, &disassembly); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, NULL); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + + /* Test with vertex shader */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs, sizeof(disasm_vs) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs); + ID3DXBuffer_Release(disassembly); + + /* Test with pixel shader */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(simple_ps, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps); + ID3DXBuffer_Release(disassembly); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6634,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_disassemble_shader(); } diff --git a/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff b/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff new file mode 100644 index 00000000000..9c56aa31739 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff @@ -0,0 +1,62 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c +index b67ffb2..02675c6 100644 +--- a/modules/rostests/winetests/d3dx9_36/shader.c ++++ b/modules/rostests/winetests/d3dx9_36/shader.c +@@ -6575,6 +6575,51 @@ static void test_shader_semantics(void) + } + } + ++static void test_disassemble_shader(void) ++{ ++ static const char disasm_vs[] = " vs_1_1\n" ++ " dcl_position v0\n" ++ " dp4 oPos.x, v0, c0\n" ++ " dp4 oPos.y, v0, c1\n" ++ " dp4 oPos.z, v0, c2\n" ++ " dp4 oPos.w, v0, c3\n"; ++ static const char disasm_ps[] = " ps_1_1\n" ++ " def c1, 1, 0, 0, 0\n" ++ " tex t0\n" ++ " dp3 r0, c1, c0\n" ++ " mul r0, v0, r0\n" ++ " mul r0, t0, r0\n"; ++ ID3DXBuffer *disassembly; ++ HRESULT ret; ++ char *ptr; ++ ++ /* Check wrong parameters */ ++ ret = D3DXDisassembleShader(NULL, FALSE, NULL, NULL); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ret = D3DXDisassembleShader(NULL, FALSE, NULL, &disassembly); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, NULL); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ++ /* Test with vertex shader */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs, sizeof(disasm_vs) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test with pixel shader */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(simple_ps, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps); ++ ID3DXBuffer_Release(disassembly); ++} ++ + START_TEST(shader) + { + test_get_shader_size(); +@@ -6589,4 +6634,5 @@ START_TEST(shader) + test_registerset(); + test_registerset_defaults(); + test_shader_semantics(); ++ test_disassemble_shader(); + }

4 years, 7 months

[reactos] 54/74: [WINESYNC] d3dx9_36: Implement D3DXDisassembleShader. (v2)

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afbc458a7f55aab4480d3… commit afbc458a7f55aab4480d316a9946c3fc47cefebe Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:26 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36: Implement D3DXDisassembleShader. (v2) Changes in v2 (by Christian Costa): * More generic code for D3DXDisassembleShader. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/shader.c | 330 ++++++++++++++++++- ..._36__Implement_D3DXDisassembleShader._(v2).diff | 357 +++++++++++++++++++++ 2 files changed, 685 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c index e8ce3dd796c..7a23867ba31 100644 --- a/dll/directx/wine/d3dx9_36/shader.c +++ b/dll/directx/wine/d3dx9_36/shader.c @@ -1,6 +1,7 @@ /* * Copyright 2008 Luis Busquets * Copyright 2009 Matteo Bruni + * Copyright 2010, 2013, 2016 Christian Costa * Copyright 2011 Travis Athougies * * This library is free software; you can redistribute it and/or @@ -20,6 +21,7 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> #include "d3dx9_private.h" #include "d3dcommon.h" @@ -2140,10 +2142,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample return D3D_OK; } + +static const char *decl_usage[] = { "position", "blendweight", "blendindices", "normal", "psize", "texcoord", + "tangent", "binormal", "tessfactor", "positiont", "color" }; + +static const char *tex_type[] = { "", "1d", "2d", "cube", "volume" }; + +static int add_modifier(char *buffer, DWORD param) +{ + char *buf = buffer; + DWORD dst_mod = param & D3DSP_DSTMOD_MASK; + + if (dst_mod & D3DSPDM_SATURATE) + buf += sprintf(buf, "_sat"); + if (dst_mod & D3DSPDM_PARTIALPRECISION) + buf += sprintf(buf, "_pp"); + if (dst_mod & D3DSPDM_MSAMPCENTROID) + buf += sprintf(buf, "_centroid"); + + return buf - buffer; +} + +static int add_register(char *buffer, DWORD param, BOOL dst, BOOL ps) +{ + char *buf = buffer; + DWORD reg_type = ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2) + | ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); + DWORD reg_num = param & D3DSP_REGNUM_MASK; + + if (reg_type == D3DSPR_INPUT) + buf += sprintf(buf, "v%d", reg_num); + else if (reg_type == D3DSPR_CONST) + buf += sprintf(buf, "c%d", reg_num); + else if (reg_type == D3DSPR_TEMP) + buf += sprintf(buf, "r%d", reg_num); + else if (reg_type == D3DSPR_ADDR) + buf += sprintf(buf, "%s%d", ps ? "t" : "a", reg_num); + else if (reg_type == D3DSPR_SAMPLER) + buf += sprintf(buf, "s%d", reg_num); + else if (reg_type == D3DSPR_RASTOUT) + buf += sprintf(buf, "oPos"); + else if (reg_type == D3DSPR_COLOROUT) + buf += sprintf(buf, "oC%d", reg_num); + else if (reg_type == D3DSPR_TEXCRDOUT) + buf += sprintf(buf, "oT%d", reg_num); + else if (reg_type == D3DSPR_ATTROUT) + buf += sprintf(buf, "oD%d", reg_num); + else + buf += sprintf(buf, "? (%d)", reg_type); + + if (dst) + { + if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) + { + buf += sprintf(buf, ".%s%s%s%s", param & D3DSP_WRITEMASK_0 ? "x" : "", + param & D3DSP_WRITEMASK_1 ? "y" : "", + param & D3DSP_WRITEMASK_2 ? "z" : "", + param & D3DSP_WRITEMASK_3 ? "w" : ""); + } + } + else + { + if ((param & D3DVS_SWIZZLE_MASK) != D3DVS_NOSWIZZLE) + { + if ( ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_X | D3DVS_Y_X | D3DVS_Z_X | D3DVS_W_X)) || + ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_Y | D3DVS_Y_Y | D3DVS_Z_Y | D3DVS_W_Y)) || + ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_Z | D3DVS_Y_Z | D3DVS_Z_Z | D3DVS_W_Z)) || + ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_W | D3DVS_Y_W | D3DVS_Z_W | D3DVS_W_W)) ) + buf += sprintf(buf, ".%c", 'w' + (((param >> D3DVS_SWIZZLE_SHIFT) + 1) & 0x3)); + else + buf += sprintf(buf, ".%c%c%c%c", 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+0)) + 1) & 0x3), + 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+2)) + 1) & 0x3), + 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+4)) + 1) & 0x3), + 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+6)) + 1) & 0x3)); + } + } + + return buf - buffer; +} + +struct instr_info +{ + DWORD opcode; + const char *name; + int length; + int (*function)(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps); + WORD min_version; + WORD max_version; +}; + +static int instr_comment(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) +{ + *ptr += 1 + ((**ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT); + return 0; +} + +static int instr_def(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) +{ + int len = sprintf(buffer, " def c%d, %g, %g, %g, %g\n", *(*ptr+1) & D3DSP_REGNUM_MASK, + (double)*(float*)(*ptr+2), (double)*(float*)(*ptr+3), + (double)*(float*)(*ptr+4), (double)*(float*)(*ptr+5)); + *ptr += 6; + return len; +} + +static int instr_dcl(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) +{ + DWORD param1 = *++*ptr; + DWORD param2 = *++*ptr; + DWORD usage = (param1 & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; + DWORD usage_index = (param1 & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + char *buf = buffer; + + buf += sprintf(buf, " dcl"); + if (ps) + { + if (param1 & D3DSP_TEXTURETYPE_MASK) + buf += sprintf(buf, "_%s", (usage <= D3DSTT_VOLUME) ? + tex_type[(param1 & D3DSP_TEXTURETYPE_MASK) >> D3DSP_TEXTURETYPE_SHIFT] : "???"); + } + else + { + buf += sprintf(buf, "_%s", (usage <= D3DDECLUSAGE_COLOR) ? decl_usage[usage] : "???"); + if (usage_index) + buf += sprintf(buf, "%d", usage_index); + } + + buf += add_modifier(buf, param2); + buf += sprintf(buf, " "); + buf += add_register(buf, param2, TRUE, TRUE); + buf += sprintf(buf, "\n"); + (*ptr)++; + return buf - buffer; +} + +static int instr_generic(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) +{ + char *buf = buffer; + int j; + + buf += sprintf(buf, " %s", info->name); + (*ptr)++; + + if (info->length) + { + buf += add_modifier(buf, **ptr); + + for (j = 0; j < info->length; j++) + { + buf += sprintf(buf, "%s ", j ? "," : ""); + + if ((j != 0) && ((**ptr & D3DSP_SRCMOD_MASK) != D3DSPSM_NONE)) + { + if ((**ptr & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) + buf += sprintf(buf, "-"); + else + buf += sprintf(buf, "*"); + } + + buf += add_register(buf, **ptr, j == 0, ps); + + if (*(*ptr)++ & D3DVS_ADDRESSMODE_MASK) + { + buf += sprintf(buf, "["); + buf += add_register(buf, **ptr, FALSE, FALSE); + buf += sprintf(buf, "]"); + (*ptr)++; + } + } + } + buf += sprintf(buf, "\n"); + return buf - buffer; +} + +const struct instr_info instructions[] = +{ + { D3DSIO_NOP, "nop", 0, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_MOV, "mov", 2, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_ADD, "add", 3, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_SUB, "sub", 3, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_MAD, "mad", 4, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_MUL, "mul", 3, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_RCP, "rcp", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_RSQ, "rsq", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_DP3, "dp3", 3, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_DP4, "dp4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 1.2 for PS */ + { D3DSIO_MIN, "min", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_MAX, "max", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_SLT, "slt", 3, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_SGE, "sge", 3, instr_generic, 0x0100, 0xFFFF }, /* VS only */ + { D3DSIO_EXP, "exp", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_LOG, "log", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_LIT, "lit", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ + { D3DSIO_DST, "dst", 3, instr_generic, 0x0100, 0xFFFF }, /* VS only */ + { D3DSIO_LRP, "lrp", 4, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for VS */ + { D3DSIO_FRC, "frc", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_M4x4, "m4x4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_M4x3, "m4x3", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_M3x4, "m3x4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_M3x3, "m3x3", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_M3x2, "m3x2", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ + { D3DSIO_CALL, "call", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_CALLNZ, "callnz", 2, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_LOOP, "loop", 2, instr_generic, 0x0200, 0xFFFF }, /* >= 3.0 for PS */ + { D3DSIO_RET, "ret", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_ENDLOOP, "endloop", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 3.0 for PS */ + { D3DSIO_LABEL, "label", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_DCL, "dcl", 1, instr_dcl, 0x0100, 0xFFFF }, + { D3DSIO_POW, "pow", 3, instr_generic, 0x0200, 0xFFFF }, + { D3DSIO_CRS, "crs", 3, instr_generic, 0x0200, 0xFFFF }, + { D3DSIO_SGN, "sgn", 4, instr_generic, 0x0200, 0xFFFF }, /* VS only */ + { D3DSIO_ABS, "abs", 2, instr_generic, 0x0200, 0xFFFF }, + { D3DSIO_NRM, "nrm", 2, instr_generic, 0x0200, 0xFFFF }, + { D3DSIO_SINCOS, "sincos", 4, instr_generic, 0x0200, 0x02FF }, + { D3DSIO_SINCOS, "sincos", 2, instr_generic, 0x0300, 0xFFFF }, + { D3DSIO_REP, "rep", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_ENDREP, "endrep", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_IF, "if", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_IFC, "if_comp", 2, instr_generic, 0x0200, 0xFFFF }, + { D3DSIO_ELSE, "else", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_ENDIF, "endif", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ + { D3DSIO_BREAK, "break", 0, instr_generic, 0x0201, 0xFFFF }, + { D3DSIO_BREAKC, "break_comp", 2, instr_generic, 0x0201, 0xFFFF }, + { D3DSIO_MOVA, "mova", 2, instr_generic, 0x0200, 0xFFFF }, /* VS only */ + { D3DSIO_DEFB, "defb", 2, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_DEFI, "defi", 2, instr_generic, 0x0100, 0xFFFF }, + { D3DSIO_TEXCOORD, "texcoord", 1, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXCOORD, "texcrd", 2, instr_generic, 0x0104, 0x0104 }, /* PS only */ + { D3DSIO_TEXKILL, "texkill", 1, instr_generic, 0x0100, 0xFFFF }, /* PS only */ + { D3DSIO_TEX, "tex", 1, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEX, "texld", 2, instr_generic, 0x0104, 0x0104 }, /* PS only */ + { D3DSIO_TEX, "texld", 3, instr_generic, 0x0200, 0xFFFF }, /* PS only */ + { D3DSIO_TEXBEM, "texbem", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXBEML, "texbeml", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXREG2AR, "texreg2ar", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXREG2GB, "texreg2gb", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x2PAD, "texm3x2pad", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x2TEX, "texm3x2tex", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x3PAD, "texm3x3pad", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x3TEX, "texm3x3tex", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x3DIFF, "texm3x3diff", 2, instr_generic, 0x0100, 0xFFFF }, /* PS only - Not documented */ + { D3DSIO_TEXM3x3SPEC, "texm3x3spec", 3, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x3VSPEC, "texm3x3vspec", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ + { D3DSIO_EXPP, "expp", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ + { D3DSIO_LOGP, "logp", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ + { D3DSIO_CND, "cnd", 4, instr_generic, 0x0100, 0x0104 }, /* PS only */ + { D3DSIO_DEF, "def", 5, instr_def, 0x0100, 0xFFFF }, + { D3DSIO_TEXREG2RGB, "texreg2rgb", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ + { D3DSIO_TEXDP3TEX, "texdp3tex", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x2DEPTH, "texm3x2depth", 2, instr_generic, 0x0103, 0x0103 }, /* PS only */ + { D3DSIO_TEXDP3, "texdp3", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ + { D3DSIO_TEXM3x3, "texm3x3", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ + { D3DSIO_TEXDEPTH, "texdepth", 1, instr_generic, 0x0104, 0x0104 }, /* PS only */ + { D3DSIO_CMP, "cmp", 4, instr_generic, 0x0102, 0xFFFF }, /* PS only */ + { D3DSIO_BEM, "bem", 3, instr_generic, 0x0104, 0x0104 }, /* PS only */ + { D3DSIO_DP2ADD, "dp2add", 4, instr_generic, 0x0200, 0xFFFF }, /* PS only */ + { D3DSIO_DSX, "dsx", 2, instr_generic, 0x0201, 0xFFFF }, /* PS only */ + { D3DSIO_DSY, "dsy", 2, instr_generic, 0x0201, 0xFFFF }, /* PS only */ + { D3DSIO_TEXLDD, "texldd", 5, instr_generic, 0x0201, 0xFFFF }, /* PS only - not existing for 2.b */ + { D3DSIO_SETP, "setp_comp", 3, instr_generic, 0x0201, 0xFFFF }, + { D3DSIO_TEXLDL, "texldl", 3, instr_generic, 0x0300, 0xFFFF }, + { D3DSIO_BREAKP, "breakp", 1, instr_generic, 0x0201, 0xFFFF }, + { D3DSIO_PHASE, "phase", 0, instr_generic, 0x0104, 0x0104 }, /* PS only */ + { D3DSIO_COMMENT, "", 0, instr_comment, 0x0100, 0xFFFF } +}; + HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, ID3DXBuffer **disassembly) { - FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); - return E_OUTOFMEMORY; + DWORD *ptr = (DWORD *)shader; + char *buffer, *buf; + UINT capacity = 4096; + BOOL ps; + WORD version; + HRESULT hr; + + TRACE("%p %d %s %p\n", shader, colorcode, debugstr_a(comments), disassembly); + + if (!shader || !disassembly) + return D3DERR_INVALIDCALL; + + buf = buffer = HeapAlloc(GetProcessHeap(), 0, capacity); + if (!buffer) + return E_OUTOFMEMORY; + + ps = (*ptr >> 16) & 1; + version = *ptr & 0xFFFF; + buf += sprintf(buf, " %s_%d_%d\n", ps ? "ps" : "vs", D3DSHADER_VERSION_MAJOR(*ptr), D3DSHADER_VERSION_MINOR(*ptr)); + ptr++; + + while (*ptr != D3DSIO_END) + { + DWORD index; + + if ((buf - buffer + 128) > capacity) + { + UINT count = buf - buffer; + char *new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, capacity * 2); + if (!new_buffer) + { + HeapFree(GetProcessHeap(), 0, buffer); + return E_OUTOFMEMORY; + } + capacity *= 2; + buffer = new_buffer; + buf = buffer + count; + } + + for (index = 0; index < sizeof(instructions)/sizeof(instructions[0]); index++) + if (((*ptr & D3DSI_OPCODE_MASK) == instructions[index].opcode) && + (version >= instructions[index].min_version) && (version <= instructions[index].max_version)) + break; + + if (index != sizeof(instructions)/sizeof(instructions[0])) + { + buf += instructions[index].function(&(instructions[index]), &ptr, buf, ps); + } + else + { + buf += sprintf(buf, " ??? (Unknown opcode %x)\n", *ptr); + while (*++ptr & (1u << 31)); + } + } + + hr = D3DXCreateBuffer(buf - buffer + 1 , disassembly); + if (SUCCEEDED(hr)) + strcpy(ID3DXBuffer_GetBufferPointer(*disassembly), buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + return hr; } struct d3dx9_texture_shader diff --git a/sdk/tools/winesync/d3dx9_staging/0005-d3dx9_36__Implement_D3DXDisassembleShader._(v2).diff b/sdk/tools/winesync/d3dx9_staging/0005-d3dx9_36__Implement_D3DXDisassembleShader._(v2).diff new file mode 100644 index 00000000000..f63d8a87887 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0005-d3dx9_36__Implement_D3DXDisassembleShader._(v2).diff @@ -0,0 +1,357 @@ +diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c +index e8ce3dd..7a23867 100644 +--- a/dll/directx/wine/d3dx9_36/shader.c ++++ b/dll/directx/wine/d3dx9_36/shader.c +@@ -1,6 +1,7 @@ + /* + * Copyright 2008 Luis Busquets + * Copyright 2009 Matteo Bruni ++ * Copyright 2010, 2013, 2016 Christian Costa + * Copyright 2011 Travis Athougies + * + * This library is free software; you can redistribute it and/or +@@ -20,6 +21,7 @@ + + #include "config.h" + #include "wine/port.h" ++#include <stdio.h> + + #include "d3dx9_private.h" + #include "d3dcommon.h" +@@ -2140,10 +2142,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample + return D3D_OK; + } + ++ ++static const char *decl_usage[] = { "position", "blendweight", "blendindices", "normal", "psize", "texcoord", ++ "tangent", "binormal", "tessfactor", "positiont", "color" }; ++ ++static const char *tex_type[] = { "", "1d", "2d", "cube", "volume" }; ++ ++static int add_modifier(char *buffer, DWORD param) ++{ ++ char *buf = buffer; ++ DWORD dst_mod = param & D3DSP_DSTMOD_MASK; ++ ++ if (dst_mod & D3DSPDM_SATURATE) ++ buf += sprintf(buf, "_sat"); ++ if (dst_mod & D3DSPDM_PARTIALPRECISION) ++ buf += sprintf(buf, "_pp"); ++ if (dst_mod & D3DSPDM_MSAMPCENTROID) ++ buf += sprintf(buf, "_centroid"); ++ ++ return buf - buffer; ++} ++ ++static int add_register(char *buffer, DWORD param, BOOL dst, BOOL ps) ++{ ++ char *buf = buffer; ++ DWORD reg_type = ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2) ++ | ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); ++ DWORD reg_num = param & D3DSP_REGNUM_MASK; ++ ++ if (reg_type == D3DSPR_INPUT) ++ buf += sprintf(buf, "v%d", reg_num); ++ else if (reg_type == D3DSPR_CONST) ++ buf += sprintf(buf, "c%d", reg_num); ++ else if (reg_type == D3DSPR_TEMP) ++ buf += sprintf(buf, "r%d", reg_num); ++ else if (reg_type == D3DSPR_ADDR) ++ buf += sprintf(buf, "%s%d", ps ? "t" : "a", reg_num); ++ else if (reg_type == D3DSPR_SAMPLER) ++ buf += sprintf(buf, "s%d", reg_num); ++ else if (reg_type == D3DSPR_RASTOUT) ++ buf += sprintf(buf, "oPos"); ++ else if (reg_type == D3DSPR_COLOROUT) ++ buf += sprintf(buf, "oC%d", reg_num); ++ else if (reg_type == D3DSPR_TEXCRDOUT) ++ buf += sprintf(buf, "oT%d", reg_num); ++ else if (reg_type == D3DSPR_ATTROUT) ++ buf += sprintf(buf, "oD%d", reg_num); ++ else ++ buf += sprintf(buf, "? (%d)", reg_type); ++ ++ if (dst) ++ { ++ if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) ++ { ++ buf += sprintf(buf, ".%s%s%s%s", param & D3DSP_WRITEMASK_0 ? "x" : "", ++ param & D3DSP_WRITEMASK_1 ? "y" : "", ++ param & D3DSP_WRITEMASK_2 ? "z" : "", ++ param & D3DSP_WRITEMASK_3 ? "w" : ""); ++ } ++ } ++ else ++ { ++ if ((param & D3DVS_SWIZZLE_MASK) != D3DVS_NOSWIZZLE) ++ { ++ if ( ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_X | D3DVS_Y_X | D3DVS_Z_X | D3DVS_W_X)) || ++ ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_Y | D3DVS_Y_Y | D3DVS_Z_Y | D3DVS_W_Y)) || ++ ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_Z | D3DVS_Y_Z | D3DVS_Z_Z | D3DVS_W_Z)) || ++ ((param & D3DSP_SWIZZLE_MASK) == (D3DVS_X_W | D3DVS_Y_W | D3DVS_Z_W | D3DVS_W_W)) ) ++ buf += sprintf(buf, ".%c", 'w' + (((param >> D3DVS_SWIZZLE_SHIFT) + 1) & 0x3)); ++ else ++ buf += sprintf(buf, ".%c%c%c%c", 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+0)) + 1) & 0x3), ++ 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+2)) + 1) & 0x3), ++ 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+4)) + 1) & 0x3), ++ 'w' + (((param >> (D3DVS_SWIZZLE_SHIFT+6)) + 1) & 0x3)); ++ } ++ } ++ ++ return buf - buffer; ++} ++ ++struct instr_info ++{ ++ DWORD opcode; ++ const char *name; ++ int length; ++ int (*function)(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps); ++ WORD min_version; ++ WORD max_version; ++}; ++ ++static int instr_comment(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) ++{ ++ *ptr += 1 + ((**ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT); ++ return 0; ++} ++ ++static int instr_def(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) ++{ ++ int len = sprintf(buffer, " def c%d, %g, %g, %g, %g\n", *(*ptr+1) & D3DSP_REGNUM_MASK, ++ (double)*(float*)(*ptr+2), (double)*(float*)(*ptr+3), ++ (double)*(float*)(*ptr+4), (double)*(float*)(*ptr+5)); ++ *ptr += 6; ++ return len; ++} ++ ++static int instr_dcl(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) ++{ ++ DWORD param1 = *++*ptr; ++ DWORD param2 = *++*ptr; ++ DWORD usage = (param1 & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; ++ DWORD usage_index = (param1 & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; ++ char *buf = buffer; ++ ++ buf += sprintf(buf, " dcl"); ++ if (ps) ++ { ++ if (param1 & D3DSP_TEXTURETYPE_MASK) ++ buf += sprintf(buf, "_%s", (usage <= D3DSTT_VOLUME) ? ++ tex_type[(param1 & D3DSP_TEXTURETYPE_MASK) >> D3DSP_TEXTURETYPE_SHIFT] : "???"); ++ } ++ else ++ { ++ buf += sprintf(buf, "_%s", (usage <= D3DDECLUSAGE_COLOR) ? decl_usage[usage] : "???"); ++ if (usage_index) ++ buf += sprintf(buf, "%d", usage_index); ++ } ++ ++ buf += add_modifier(buf, param2); ++ buf += sprintf(buf, " "); ++ buf += add_register(buf, param2, TRUE, TRUE); ++ buf += sprintf(buf, "\n"); ++ (*ptr)++; ++ return buf - buffer; ++} ++ ++static int instr_generic(const struct instr_info *info, DWORD **ptr, char *buffer, BOOL ps) ++{ ++ char *buf = buffer; ++ int j; ++ ++ buf += sprintf(buf, " %s", info->name); ++ (*ptr)++; ++ ++ if (info->length) ++ { ++ buf += add_modifier(buf, **ptr); ++ ++ for (j = 0; j < info->length; j++) ++ { ++ buf += sprintf(buf, "%s ", j ? "," : ""); ++ ++ if ((j != 0) && ((**ptr & D3DSP_SRCMOD_MASK) != D3DSPSM_NONE)) ++ { ++ if ((**ptr & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) ++ buf += sprintf(buf, "-"); ++ else ++ buf += sprintf(buf, "*"); ++ } ++ ++ buf += add_register(buf, **ptr, j == 0, ps); ++ ++ if (*(*ptr)++ & D3DVS_ADDRESSMODE_MASK) ++ { ++ buf += sprintf(buf, "["); ++ buf += add_register(buf, **ptr, FALSE, FALSE); ++ buf += sprintf(buf, "]"); ++ (*ptr)++; ++ } ++ } ++ } ++ buf += sprintf(buf, "\n"); ++ return buf - buffer; ++} ++ ++const struct instr_info instructions[] = ++{ ++ { D3DSIO_NOP, "nop", 0, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_MOV, "mov", 2, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_ADD, "add", 3, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_SUB, "sub", 3, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_MAD, "mad", 4, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_MUL, "mul", 3, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_RCP, "rcp", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_RSQ, "rsq", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_DP3, "dp3", 3, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_DP4, "dp4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 1.2 for PS */ ++ { D3DSIO_MIN, "min", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_MAX, "max", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_SLT, "slt", 3, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_SGE, "sge", 3, instr_generic, 0x0100, 0xFFFF }, /* VS only */ ++ { D3DSIO_EXP, "exp", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_LOG, "log", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_LIT, "lit", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ ++ { D3DSIO_DST, "dst", 3, instr_generic, 0x0100, 0xFFFF }, /* VS only */ ++ { D3DSIO_LRP, "lrp", 4, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for VS */ ++ { D3DSIO_FRC, "frc", 2, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_M4x4, "m4x4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_M4x3, "m4x3", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_M3x4, "m3x4", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_M3x3, "m3x3", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_M3x2, "m3x2", 3, instr_generic, 0x0100, 0xFFFF }, /* >= 2.0 for PS */ ++ { D3DSIO_CALL, "call", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_CALLNZ, "callnz", 2, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_LOOP, "loop", 2, instr_generic, 0x0200, 0xFFFF }, /* >= 3.0 for PS */ ++ { D3DSIO_RET, "ret", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_ENDLOOP, "endloop", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 3.0 for PS */ ++ { D3DSIO_LABEL, "label", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_DCL, "dcl", 1, instr_dcl, 0x0100, 0xFFFF }, ++ { D3DSIO_POW, "pow", 3, instr_generic, 0x0200, 0xFFFF }, ++ { D3DSIO_CRS, "crs", 3, instr_generic, 0x0200, 0xFFFF }, ++ { D3DSIO_SGN, "sgn", 4, instr_generic, 0x0200, 0xFFFF }, /* VS only */ ++ { D3DSIO_ABS, "abs", 2, instr_generic, 0x0200, 0xFFFF }, ++ { D3DSIO_NRM, "nrm", 2, instr_generic, 0x0200, 0xFFFF }, ++ { D3DSIO_SINCOS, "sincos", 4, instr_generic, 0x0200, 0x02FF }, ++ { D3DSIO_SINCOS, "sincos", 2, instr_generic, 0x0300, 0xFFFF }, ++ { D3DSIO_REP, "rep", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_ENDREP, "endrep", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_IF, "if", 1, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_IFC, "if_comp", 2, instr_generic, 0x0200, 0xFFFF }, ++ { D3DSIO_ELSE, "else", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_ENDIF, "endif", 0, instr_generic, 0x0200, 0xFFFF }, /* >= 2.a for PS */ ++ { D3DSIO_BREAK, "break", 0, instr_generic, 0x0201, 0xFFFF }, ++ { D3DSIO_BREAKC, "break_comp", 2, instr_generic, 0x0201, 0xFFFF }, ++ { D3DSIO_MOVA, "mova", 2, instr_generic, 0x0200, 0xFFFF }, /* VS only */ ++ { D3DSIO_DEFB, "defb", 2, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_DEFI, "defi", 2, instr_generic, 0x0100, 0xFFFF }, ++ { D3DSIO_TEXCOORD, "texcoord", 1, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXCOORD, "texcrd", 2, instr_generic, 0x0104, 0x0104 }, /* PS only */ ++ { D3DSIO_TEXKILL, "texkill", 1, instr_generic, 0x0100, 0xFFFF }, /* PS only */ ++ { D3DSIO_TEX, "tex", 1, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEX, "texld", 2, instr_generic, 0x0104, 0x0104 }, /* PS only */ ++ { D3DSIO_TEX, "texld", 3, instr_generic, 0x0200, 0xFFFF }, /* PS only */ ++ { D3DSIO_TEXBEM, "texbem", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXBEML, "texbeml", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXREG2AR, "texreg2ar", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXREG2GB, "texreg2gb", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x2PAD, "texm3x2pad", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x2TEX, "texm3x2tex", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x3PAD, "texm3x3pad", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x3TEX, "texm3x3tex", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x3DIFF, "texm3x3diff", 2, instr_generic, 0x0100, 0xFFFF }, /* PS only - Not documented */ ++ { D3DSIO_TEXM3x3SPEC, "texm3x3spec", 3, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x3VSPEC, "texm3x3vspec", 2, instr_generic, 0x0100, 0x0103 }, /* PS only */ ++ { D3DSIO_EXPP, "expp", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ ++ { D3DSIO_LOGP, "logp", 2, instr_generic, 0x0100, 0xFFFF }, /* VS only */ ++ { D3DSIO_CND, "cnd", 4, instr_generic, 0x0100, 0x0104 }, /* PS only */ ++ { D3DSIO_DEF, "def", 5, instr_def, 0x0100, 0xFFFF }, ++ { D3DSIO_TEXREG2RGB, "texreg2rgb", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXDP3TEX, "texdp3tex", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x2DEPTH, "texm3x2depth", 2, instr_generic, 0x0103, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXDP3, "texdp3", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXM3x3, "texm3x3", 2, instr_generic, 0x0102, 0x0103 }, /* PS only */ ++ { D3DSIO_TEXDEPTH, "texdepth", 1, instr_generic, 0x0104, 0x0104 }, /* PS only */ ++ { D3DSIO_CMP, "cmp", 4, instr_generic, 0x0102, 0xFFFF }, /* PS only */ ++ { D3DSIO_BEM, "bem", 3, instr_generic, 0x0104, 0x0104 }, /* PS only */ ++ { D3DSIO_DP2ADD, "dp2add", 4, instr_generic, 0x0200, 0xFFFF }, /* PS only */ ++ { D3DSIO_DSX, "dsx", 2, instr_generic, 0x0201, 0xFFFF }, /* PS only */ ++ { D3DSIO_DSY, "dsy", 2, instr_generic, 0x0201, 0xFFFF }, /* PS only */ ++ { D3DSIO_TEXLDD, "texldd", 5, instr_generic, 0x0201, 0xFFFF }, /* PS only - not existing for 2.b */ ++ { D3DSIO_SETP, "setp_comp", 3, instr_generic, 0x0201, 0xFFFF }, ++ { D3DSIO_TEXLDL, "texldl", 3, instr_generic, 0x0300, 0xFFFF }, ++ { D3DSIO_BREAKP, "breakp", 1, instr_generic, 0x0201, 0xFFFF }, ++ { D3DSIO_PHASE, "phase", 0, instr_generic, 0x0104, 0x0104 }, /* PS only */ ++ { D3DSIO_COMMENT, "", 0, instr_comment, 0x0100, 0xFFFF } ++}; ++ + HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, ID3DXBuffer **disassembly) + { +- FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); +- return E_OUTOFMEMORY; ++ DWORD *ptr = (DWORD *)shader; ++ char *buffer, *buf; ++ UINT capacity = 4096; ++ BOOL ps; ++ WORD version; ++ HRESULT hr; ++ ++ TRACE("%p %d %s %p\n", shader, colorcode, debugstr_a(comments), disassembly); ++ ++ if (!shader || !disassembly) ++ return D3DERR_INVALIDCALL; ++ ++ buf = buffer = HeapAlloc(GetProcessHeap(), 0, capacity); ++ if (!buffer) ++ return E_OUTOFMEMORY; ++ ++ ps = (*ptr >> 16) & 1; ++ version = *ptr & 0xFFFF; ++ buf += sprintf(buf, " %s_%d_%d\n", ps ? "ps" : "vs", D3DSHADER_VERSION_MAJOR(*ptr), D3DSHADER_VERSION_MINOR(*ptr)); ++ ptr++; ++ ++ while (*ptr != D3DSIO_END) ++ { ++ DWORD index; ++ ++ if ((buf - buffer + 128) > capacity) ++ { ++ UINT count = buf - buffer; ++ char *new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, capacity * 2); ++ if (!new_buffer) ++ { ++ HeapFree(GetProcessHeap(), 0, buffer); ++ return E_OUTOFMEMORY; ++ } ++ capacity *= 2; ++ buffer = new_buffer; ++ buf = buffer + count; ++ } ++ ++ for (index = 0; index < sizeof(instructions)/sizeof(instructions[0]); index++) ++ if (((*ptr & D3DSI_OPCODE_MASK) == instructions[index].opcode) && ++ (version >= instructions[index].min_version) && (version <= instructions[index].max_version)) ++ break; ++ ++ if (index != sizeof(instructions)/sizeof(instructions[0])) ++ { ++ buf += instructions[index].function(&(instructions[index]), &ptr, buf, ps); ++ } ++ else ++ { ++ buf += sprintf(buf, " ??? (Unknown opcode %x)\n", *ptr); ++ while (*++ptr & (1u << 31)); ++ } ++ } ++ ++ hr = D3DXCreateBuffer(buf - buffer + 1 , disassembly); ++ if (SUCCEEDED(hr)) ++ strcpy(ID3DXBuffer_GetBufferPointer(*disassembly), buffer); ++ HeapFree(GetProcessHeap(), 0, buffer); ++ ++ return hr; + } + + struct d3dx9_texture_shader

4 years, 7 months

[reactos] 53/74: [WINESYNC] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e6848d18a01313ed3334… commit 4e6848d18a01313ed333478ad690e81fcce7096b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:25 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect. wine-staging patch by Sebastian Lackner <sebastian(a)fds-team.de> --- dll/directx/wine/d3dx9_36/effect.c | 4 +++- ..._36__Improve_stub_for_ID3DXEffectImpl_CloneEffect.diff | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index e8ae7b54c22..3538b1578d1 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -4555,7 +4555,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, if (!device) return D3DERR_INVALIDCALL; - return E_NOTIMPL; + iface->lpVtbl->AddRef(iface); + *effect = iface; + return S_OK; } #if D3DX_SDK_VERSION >= 27 diff --git a/sdk/tools/winesync/d3dx9_staging/0004-d3dx9_36__Improve_stub_for_ID3DXEffectImpl_CloneEffect.diff b/sdk/tools/winesync/d3dx9_staging/0004-d3dx9_36__Improve_stub_for_ID3DXEffectImpl_CloneEffect.diff new file mode 100644 index 00000000000..7277ee9c053 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0004-d3dx9_36__Improve_stub_for_ID3DXEffectImpl_CloneEffect.diff @@ -0,0 +1,15 @@ +diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c +index e8ae7b5..3538b15 100644 +--- a/dll/directx/wine/d3dx9_36/effect.c ++++ b/dll/directx/wine/d3dx9_36/effect.c +@@ -4555,7 +4555,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, + if (!device) + return D3DERR_INVALIDCALL; + +- return E_NOTIMPL; ++ iface->lpVtbl->AddRef(iface); ++ *effect = iface; ++ return S_OK; + } + + #if D3DX_SDK_VERSION >= 27

4 years, 7 months

[reactos] 52/74: [WINESYNC] d3dx9_36: Add format description for X8L8V8U8 for format conversions.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77cb466268d426c831f31… commit 77cb466268d426c831f3110d500bd25c158a9fc4 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Feb 1 18:02:25 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36: Add format description for X8L8V8U8 for format conversions. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/util.c | 1 + ...rmat_description_for_X8L8V8U8_for_format_conversions.diff | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/util.c b/dll/directx/wine/d3dx9_36/util.c index af71250b785..029e50073c3 100644 --- a/dll/directx/wine/d3dx9_36/util.c +++ b/dll/directx/wine/d3dx9_36/util.c @@ -90,6 +90,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_G32R32F, { 0, 32, 32, 0}, { 0, 0, 32, 0}, 8, 1, 1, 8, FORMAT_ARGBF, NULL, NULL }, {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, {D3DFMT_P8, { 8, 8, 8, 8}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_INDEX, NULL, index_to_rgba}, + {D3DFMT_X8L8V8U8, { 0, 8, 8, 8}, { 0, 0, 8, 16}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, }; diff --git a/sdk/tools/winesync/d3dx9_staging/0003-d3dx9_36__Add_format_description_for_X8L8V8U8_for_format_conversions.diff b/sdk/tools/winesync/d3dx9_staging/0003-d3dx9_36__Add_format_description_for_X8L8V8U8_for_format_conversions.diff new file mode 100644 index 00000000000..3c9cd31ca24 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0003-d3dx9_36__Add_format_description_for_X8L8V8U8_for_format_conversions.diff @@ -0,0 +1,12 @@ +diff --git a/dll/directx/wine/d3dx9_36/util.c b/dll/directx/wine/d3dx9_36/util.c +index af71250..029e500 100644 +--- a/dll/directx/wine/d3dx9_36/util.c ++++ b/dll/directx/wine/d3dx9_36/util.c +@@ -90,6 +90,7 @@ static const struct pixel_format_desc formats[] = + {D3DFMT_G32R32F, { 0, 32, 32, 0}, { 0, 0, 32, 0}, 8, 1, 1, 8, FORMAT_ARGBF, NULL, NULL }, + {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, + {D3DFMT_P8, { 8, 8, 8, 8}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_INDEX, NULL, index_to_rgba}, ++ {D3DFMT_X8L8V8U8, { 0, 8, 8, 8}, { 0, 0, 8, 16}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + /* marks last element */ + {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, + };

4 years, 7 months

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 2020