From 1bc2bc040439fd225f8abd9c07776801336b76e2 Mon Sep 17 00:00:00 2001 From: Elizabeth Figura Date: Thu, 7 Nov 2024 16:09:50 -0600 Subject: [PATCH] Rebase against 24694dabfc53fc850cf035e187a4c15b77d6bc77. --- ...d-semi-stub-for-D3DXOptimizeVertices.patch | 371 ------------------ .../d3dx9_36-D3DXOptimizeVertices/definition | 1 - staging/upstream-commit | 2 +- 3 files changed, 1 insertion(+), 373 deletions(-) delete mode 100644 patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch delete mode 100644 patches/d3dx9_36-D3DXOptimizeVertices/definition diff --git a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch b/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch deleted file mode 100644 index 3815a4d5..00000000 --- a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch +++ /dev/null @@ -1,371 +0,0 @@ -From 3eb7b781849135fefeece9ca257ca9673b1545fd Mon Sep 17 00:00:00 2001 -From: Christian Costa -Date: Sun, 16 Jul 2017 18:13:31 +0200 -Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices. - ---- - dlls/d3dx9_24/d3dx9_24.spec | 2 +- - dlls/d3dx9_25/d3dx9_25.spec | 2 +- - dlls/d3dx9_26/d3dx9_26.spec | 2 +- - dlls/d3dx9_27/d3dx9_27.spec | 2 +- - dlls/d3dx9_28/d3dx9_28.spec | 2 +- - dlls/d3dx9_29/d3dx9_29.spec | 2 +- - dlls/d3dx9_30/d3dx9_30.spec | 2 +- - dlls/d3dx9_31/d3dx9_31.spec | 2 +- - dlls/d3dx9_32/d3dx9_32.spec | 2 +- - dlls/d3dx9_33/d3dx9_33.spec | 2 +- - dlls/d3dx9_34/d3dx9_34.spec | 2 +- - dlls/d3dx9_35/d3dx9_35.spec | 2 +- - dlls/d3dx9_36/d3dx9_36.spec | 2 +- - dlls/d3dx9_36/mesh.c | 27 +++++++++++++++++++++++++++ - dlls/d3dx9_36/tests/mesh.c | 22 ++++++++++++++++++++++ - dlls/d3dx9_37/d3dx9_37.spec | 2 +- - dlls/d3dx9_38/d3dx9_38.spec | 2 +- - dlls/d3dx9_39/d3dx9_39.spec | 2 +- - dlls/d3dx9_40/d3dx9_40.spec | 2 +- - dlls/d3dx9_41/d3dx9_41.spec | 2 +- - dlls/d3dx9_42/d3dx9_42.spec | 2 +- - dlls/d3dx9_43/d3dx9_43.spec | 2 +- - 22 files changed, 69 insertions(+), 20 deletions(-) - -diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec -index 0ca8777efe6..9b52c2bf307 100644 ---- a/dlls/d3dx9_24/d3dx9_24.spec -+++ b/dlls/d3dx9_24/d3dx9_24.spec -@@ -226,7 +226,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec -index a5449810a43..fc75dfd9c04 100644 ---- a/dlls/d3dx9_25/d3dx9_25.spec -+++ b/dlls/d3dx9_25/d3dx9_25.spec -@@ -226,7 +226,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec -index 9e1200442f4..85d9fc5332e 100644 ---- a/dlls/d3dx9_26/d3dx9_26.spec -+++ b/dlls/d3dx9_26/d3dx9_26.spec -@@ -230,7 +230,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec -index 9e1200442f4..85d9fc5332e 100644 ---- a/dlls/d3dx9_27/d3dx9_27.spec -+++ b/dlls/d3dx9_27/d3dx9_27.spec -@@ -230,7 +230,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec -index b316a23baf1..62673ccd7af 100644 ---- a/dlls/d3dx9_28/d3dx9_28.spec -+++ b/dlls/d3dx9_28/d3dx9_28.spec -@@ -230,7 +230,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec -index b316a23baf1..62673ccd7af 100644 ---- a/dlls/d3dx9_29/d3dx9_29.spec -+++ b/dlls/d3dx9_29/d3dx9_29.spec -@@ -230,7 +230,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec -index e00fa547862..2c7575d88fc 100644 ---- a/dlls/d3dx9_30/d3dx9_30.spec -+++ b/dlls/d3dx9_30/d3dx9_30.spec -@@ -230,7 +230,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec -index d308939ef67..a41eb3e9af2 100644 ---- a/dlls/d3dx9_31/d3dx9_31.spec -+++ b/dlls/d3dx9_31/d3dx9_31.spec -@@ -227,7 +227,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec -index c2292dff396..eab56b3c9ee 100644 ---- a/dlls/d3dx9_32/d3dx9_32.spec -+++ b/dlls/d3dx9_32/d3dx9_32.spec -@@ -227,7 +227,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec -index c2292dff396..eab56b3c9ee 100644 ---- a/dlls/d3dx9_33/d3dx9_33.spec -+++ b/dlls/d3dx9_33/d3dx9_33.spec -@@ -227,7 +227,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec -index c2292dff396..eab56b3c9ee 100644 ---- a/dlls/d3dx9_34/d3dx9_34.spec -+++ b/dlls/d3dx9_34/d3dx9_34.spec -@@ -227,7 +227,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec -index c2292dff396..eab56b3c9ee 100644 ---- a/dlls/d3dx9_35/d3dx9_35.spec -+++ b/dlls/d3dx9_35/d3dx9_35.spec -@@ -227,7 +227,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_36/d3dx9_36.spec -+++ b/dlls/d3dx9_36/d3dx9_36.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c -index 6294ce624fe..12cb7eb7258 100644 ---- a/dlls/d3dx9_36/mesh.c -+++ b/dlls/d3dx9_36/mesh.c -@@ -7184,6 +7184,33 @@ cleanup: - return hr; - } - -+ -+/************************************************************************* -+ * D3DXOptimizeVertices (D3DX9_36.@) -+ */ -+HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, -+ UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) -+{ -+ UINT i; -+ -+ FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", -+ indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); -+ -+ if (!vertex_remap) -+ { -+ WARN("vertex remap pointer is NULL.\n"); -+ return D3DERR_INVALIDCALL; -+ } -+ -+ for (i = 0; i < num_vertices; i++) -+ { -+ vertex_remap[i] = i; -+ } -+ -+ return D3D_OK; -+} -+ -+ - /************************************************************************* - * D3DXOptimizeFaces (D3DX9_36.@) - * -diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c -index f437a83cbd8..c5faae520c9 100644 ---- a/dlls/d3dx9_36/tests/mesh.c -+++ b/dlls/d3dx9_36/tests/mesh.c -@@ -10403,6 +10403,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 %lx, 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 %lx, expected D3DERR_INVALIDCALL.\n", hr); -+} -+ - static void test_optimize_faces(void) - { - HRESULT hr; -@@ -11291,6 +11312,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/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_37/d3dx9_37.spec -+++ b/dlls/d3dx9_37/d3dx9_37.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_38/d3dx9_38.spec -+++ b/dlls/d3dx9_38/d3dx9_38.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_39/d3dx9_39.spec -+++ b/dlls/d3dx9_39/d3dx9_39.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_40/d3dx9_40.spec -+++ b/dlls/d3dx9_40/d3dx9_40.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec -index 0fdf4e135e1..6201657d4a5 100644 ---- a/dlls/d3dx9_41/d3dx9_41.spec -+++ b/dlls/d3dx9_41/d3dx9_41.spec -@@ -229,7 +229,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec -index 2f2ac5fd619..7cfc439f84b 100644 ---- a/dlls/d3dx9_42/d3dx9_42.spec -+++ b/dlls/d3dx9_42/d3dx9_42.spec -@@ -222,7 +222,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) -diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec -index 2f2ac5fd619..7cfc439f84b 100644 ---- a/dlls/d3dx9_43/d3dx9_43.spec -+++ b/dlls/d3dx9_43/d3dx9_43.spec -@@ -222,7 +222,7 @@ - @ stdcall D3DXMatrixTranslation(ptr float float float) - @ stdcall D3DXMatrixTranspose(ptr ptr) - @ stdcall D3DXOptimizeFaces(ptr long long long ptr) --@ stub D3DXOptimizeVertices(ptr long long long ptr) -+@ stdcall D3DXOptimizeVertices(ptr long long long ptr) - @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) - @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) - @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) --- -2.14.2 - diff --git a/patches/d3dx9_36-D3DXOptimizeVertices/definition b/patches/d3dx9_36-D3DXOptimizeVertices/definition deleted file mode 100644 index 2ef13e4c..00000000 --- a/patches/d3dx9_36-D3DXOptimizeVertices/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [47776] Timeshift needs D3DXOptimizeVertices() diff --git a/staging/upstream-commit b/staging/upstream-commit index b6ea589d..9518ed2c 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6db2812411d45ca4b4d15dea9a00577ea17b508e +24694dabfc53fc850cf035e187a4c15b77d6bc77