From eb7affd91181fdecc929da15f18f52d09531668b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 21 Apr 2024 12:07:47 -0400
Subject: [PATCH] testsuite: Fix the offload tests

---
 testsuite/gsk/offload/deep.node      | 77 +++++++++++++++++-----------
 testsuite/gsk/offload/deep.offload   |  4 +-
 testsuite/gsk/offload/deep.offload2  |  0
 testsuite/gsk/offload/simple.node    | 13 +++--
 testsuite/gsk/offload/simple.offload |  2 +-
 5 files changed, 57 insertions(+), 39 deletions(-)
 delete mode 100644 testsuite/gsk/offload/deep.offload2

diff --git a/testsuite/gsk/offload/deep.node b/testsuite/gsk/offload/deep.node
index d553c8445d..4b97ee4c78 100644
--- a/testsuite/gsk/offload/deep.node
+++ b/testsuite/gsk/offload/deep.node
@@ -4,7 +4,7 @@ subsurface {
     child: debug {
       message: "Affine transforms, debug nodes and single-child containers are ok";
       child: transform {
-        transform: translate(10, 10) scale(5, 10);
+        transform: translate(10, 10) scale(2, 1);
         child: container {
           texture { }
         }
@@ -12,47 +12,62 @@ subsurface {
     }
   }
 }
-subsurface {
-  child: debug {
-    message: "Multi-child containers are not ok";
-    child: container {
-      color { }
-      texture { }
+transform {
+  transform: translate(0, 100);
+  child: subsurface {
+    child: debug {
+      message: "Multi-child containers are not ok";
+      child: container {
+        color { }
+        texture { }
+      }
     }
   }
 }
-subsurface {
-  child: debug {
-    message: "other nodes, such as cross-fade, are not ok";
-    child: cross-fade {
-      start: texture { }
-      end: texture { }
-      progress: 0.5;
+transform {
+  transform: translate(0, 200);
+  child: subsurface {
+    child: debug {
+      message: "other nodes, such as cross-fade, are not ok";
+      child: cross-fade {
+        start: texture { }
+        end: texture { }
+        progress: 0.5;
+      }
     }
   }
 }
-subsurface {
-  child: debug {
-    message: "Other nodes, such as cross-fade, are not ok";
-    child: cross-fade {
-      start: texture { }
-      end: texture { }
-      progress: 0.5;
+transform {
+  transform: translate(0, 300);
+  child: subsurface {
+    child: debug {
+      message: "Other nodes, such as cross-fade, are not ok";
+      child: cross-fade {
+        start: texture { }
+        end: texture { }
+        progress: 0.5;
+      }
     }
   }
 }
-subsurface {
-  child: debug {
-    message: "Clips are ok";
-    child: clip {
-      clip: 0 0 400 400;
-      child: texture { }
+transform {
+  transform: translate(0, 400);
+  child: subsurface {
+    child: debug {
+      message: "Clips are ok";
+      child: clip {
+        clip: 0 0 400 400;
+        child: texture { }
+      }
     }
   }
 }
-subsurface {
-  child: debug {
-    message: "Can't offload non-textures";
-    child: linear-gradient { }
+transform {
+  transform: translate(0, 500);
+  child: subsurface {
+   child: debug {
+       message: "Can't offload non-textures";
+       child: linear-gradient { }
+     }
   }
 }
diff --git a/testsuite/gsk/offload/deep.offload b/testsuite/gsk/offload/deep.offload
index 056867698b..48f57cc930 100644
--- a/testsuite/gsk/offload/deep.offload
+++ b/testsuite/gsk/offload/deep.offload
@@ -1,6 +1,6 @@
-0: offloaded, above: -, texture: 10x10, source: 0 0 10 10, dest: 10 10 250 500
+0: offloaded, raised, above: -, texture: 10x10, source: 0 0 10 10, dest: 10 10 100 50
 1: not offloaded
 2: not offloaded
 3: not offloaded
-4: offloaded, above: 0, texture: 10x10, source: 0 0 10 10, dest: 0 0 50 50
+4: offloaded, raised, above: 0, texture: 10x10, source: 0 0 10 10, dest: 0 400 50 50
 5: not offloaded
diff --git a/testsuite/gsk/offload/deep.offload2 b/testsuite/gsk/offload/deep.offload2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testsuite/gsk/offload/simple.node b/testsuite/gsk/offload/simple.node
index d2ad6bd3b1..2eea3a9a1c 100644
--- a/testsuite/gsk/offload/simple.node
+++ b/testsuite/gsk/offload/simple.node
@@ -15,11 +15,14 @@ container {
       }
     }
   }
-  opacity {
-    opacity: 0.5;
-    child: subsurface {
-      child: texture {
-        texture: url('data:image/svg+xml;utf-8,<svg width="16" height="16"></svg>');
+  transform {
+    transform: translate(0,200);
+    child: opacity {
+      opacity: 0.5;
+      child: subsurface {
+        child: texture {
+          texture: url('data:image/svg+xml;utf-8,<svg width="16" height="16"></svg>');
+        }
       }
     }
   }
diff --git a/testsuite/gsk/offload/simple.offload b/testsuite/gsk/offload/simple.offload
index aec97cfaab..791693efa7 100644
--- a/testsuite/gsk/offload/simple.offload
+++ b/testsuite/gsk/offload/simple.offload
@@ -1,3 +1,3 @@
-0: offloaded, above: -, texture: 13x17, source: 0 0 13 17, dest: 20 20 50 50
+0: offloaded, raised, above: -, texture: 13x17, source: 0 0 13 17, dest: 20 20 50 50
 1: offloaded, raised, above: 0, texture: 10x21, source: 0 0 10 21, dest: 0 100 500 500
 2: not offloaded