[PATCH v3 0/1] MR1751: gdiplus: improve performance of GdipTranslateMatrix

[Bartosz Kosiorek (＠gang65)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947

--
  v3: gdiplus: improve performance of GdipTranslateMatrix
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1751

[PATCH v3 1/1] gdiplus: improve performance of GdipTranslateMatrix

[Bartosz Kosiorek]

From: Bartosz Kosiorek <gang65(a)poczta.onet.pl>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947
---
 dlls/gdiplus/matrix.c       | 21 ++++++++++---------
 dlls/gdiplus/tests/matrix.c | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c
index d790daab2af..d69672bddcf 100644
--- a/dlls/gdiplus/matrix.c
+++ b/dlls/gdiplus/matrix.c
@@ -417,24 +417,23 @@ GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, I
 GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX,
     REAL offsetY, GpMatrixOrder order)
 {
-    REAL translate[6];
-
     TRACE("(%p, %.2f, %.2f, %d)\n", matrix, offsetX, offsetY, order);
 
     if(!matrix)
         return InvalidParameter;
 
-    translate[0] = 1.0;
-    translate[1] = 0.0;
-    translate[2] = 0.0;
-    translate[3] = 1.0;
-    translate[4] = offsetX;
-    translate[5] = offsetY;
-
     if(order == MatrixOrderAppend)
-        matrix_multiply(matrix->matrix, translate, matrix->matrix);
+    {
+        matrix->matrix[4] += offsetX;
+        matrix->matrix[5] += offsetY;
+    }
     else if (order == MatrixOrderPrepend)
-        matrix_multiply(translate, matrix->matrix, matrix->matrix);
+    {
+        matrix->matrix[4] = offsetX * matrix->matrix[0] + offsetY * matrix->matrix[2]
+            + matrix->matrix[4];
+        matrix->matrix[5] = offsetX * matrix->matrix[1] + offsetY * matrix->matrix[3]
+            + matrix->matrix[5];
+    }
     else
         return InvalidParameter;
 
diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c
index 53a57089bbc..dea08c13120 100644
--- a/dlls/gdiplus/tests/matrix.c
+++ b/dlls/gdiplus/tests/matrix.c
@@ -110,6 +110,45 @@ static void test_transform(void)
     GdipDeleteMatrix(matrix);
 }
 
+static void test_translate(void)
+{
+    GpStatus status;
+    GpMatrix *matrix = NULL;
+    REAL elems[6];
+
+    static const REAL expected_elem_append[] = {1.0, -2.0, 30.0, 40.0, -470.0, 620.0};
+    static const REAL expected_elem_prepend[] = {1.0, -2.0, 30.0, 40.0, 130.0, 1340.0};
+
+    GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix);
+
+    status = GdipTranslateMatrix(NULL, 30.0, 20.0, MatrixOrderAppend);
+    expect(InvalidParameter, status);
+    status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderAppend);
+    expect(Ok, status);
+
+    status = GdipGetMatrixElements(matrix, elems);
+    expect(Ok, status);
+    GdipDeleteMatrix(matrix);
+
+    for(INT i = 0; i < 6; i++)
+        ok(expected_elem_append[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i,
+           expected_elem_append[i], elems[i]);
+
+    GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix);
+
+    status = GdipTranslateMatrix(matrix, 30.0, 20.0, MatrixOrderPrepend);
+    expect(Ok, status);
+
+    status = GdipGetMatrixElements(matrix, elems);
+    expect(Ok, status);
+    GdipDeleteMatrix(matrix);
+
+    for(INT i = 0; i < 6; i++)
+        ok(expected_elem_prepend[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i,
+           expected_elem_prepend[i], elems[i]);
+
+}
+
 static void test_scale(void)
 {
     GpStatus status;
@@ -430,6 +469,7 @@ START_TEST(matrix)
     GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
 
     test_constructor_destructor();
+    test_translate();
     test_scale();
     test_transform();
     test_isinvertible();
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1751

[Bartosz Kosiorek (＠gang65)]

On Fri Dec  9 19:27:05 2022 +0000, Esme Povirk wrote:
> It'd be nice to have a test for Prepend order as well, although the math
> looks right to me.
> The tests for prepend and append are already there.
> I have updated variable names to improve visibility.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1751#note_19344

[Esme Povirk (＠madewokherd)]

On Fri Dec  9 20:15:50 2022 +0000, Bartosz Kosiorek wrote:
> The tests for prepend and append are already there.
> I have updated variable names to improve visibility.
> Oh, sorry for missing that.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1751#note_19345

[PATCH v3 0/1] MR1751: gdiplus: improve performance of GdipTranslateMatrix - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1751