diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/000.png
new file mode 100644
index 0000000000..4daa4ef5bd
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed curve loops/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/000.png
new file mode 100644
index 0000000000..c95079d1ee
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing closed polylines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/000.png
new file mode 100644
index 0000000000..0783c28630
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing polylines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/000.png
new file mode 100644
index 0000000000..82b5f52667
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing quad strips/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/000.png
new file mode 100644
index 0000000000..312ba495b5
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle fans/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/000.png
new file mode 100644
index 0000000000..dfe2d3613f
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing triangle strips/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/000.png
new file mode 100644
index 0000000000..adc4faeb7f
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with contours/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/000.png
new file mode 100644
index 0000000000..765d6854ee
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with cubic beziers/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/000.png
new file mode 100644
index 0000000000..637d4e07ac
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves with tightness/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/000.png
new file mode 100644
index 0000000000..badfc0b013
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with curves/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/000.png
new file mode 100644
index 0000000000..0ba8a3e125
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with lines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/000.png
new file mode 100644
index 0000000000..2dccf64211
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with points/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/000.png
new file mode 100644
index 0000000000..3569ede13f
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quadratic beziers/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/000.png
new file mode 100644
index 0000000000..8ec52cb90c
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with quads/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/000.png b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/000.png
new file mode 100644
index 0000000000..9d17993f8d
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/metadata.json b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/2D mode/Drawing with triangles/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/000.png
new file mode 100644
index 0000000000..6c6530c43f
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D cubic coordinates/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/000.png
new file mode 100644
index 0000000000..939a41d90b
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D quadratic coordinates/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/000.png
new file mode 100644
index 0000000000..fe084aace4
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/3D vertex coordinates/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/000.png
new file mode 100644
index 0000000000..06d37a344e
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed curve loops/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/000.png
new file mode 100644
index 0000000000..ca2a15d8f4
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing closed polylines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/000.png
new file mode 100644
index 0000000000..ef1270302b
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing polylines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/000.png
new file mode 100644
index 0000000000..38ce19217c
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing quad strips/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/000.png
new file mode 100644
index 0000000000..710a721913
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle fans/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/000.png
new file mode 100644
index 0000000000..38ce19217c
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing triangle strips/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/000.png
new file mode 100644
index 0000000000..591a21fa84
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with contours/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/000.png
new file mode 100644
index 0000000000..ddb58a6c52
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with cubic beziers/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/000.png
new file mode 100644
index 0000000000..f300018788
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves with tightness/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/000.png
new file mode 100644
index 0000000000..ade05a1a75
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with curves/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/000.png
new file mode 100644
index 0000000000..aaadb8a325
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with lines/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/000.png
new file mode 100644
index 0000000000..e3057c630b
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with points/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/000.png
new file mode 100644
index 0000000000..769a908688
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quadratic beziers/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/000.png
new file mode 100644
index 0000000000..c843285d5e
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with quads/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/000.png
new file mode 100644
index 0000000000..b01d97bc81
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Drawing with triangles/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/000.png
new file mode 100644
index 0000000000..87df4ea7b1
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Normalized texture coordinates/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/000.png
new file mode 100644
index 0000000000..774ba1fe20
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex fills/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/000.png
new file mode 100644
index 0000000000..56b99d970c
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex normals/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/000.png
new file mode 100644
index 0000000000..6a0ed871a5
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Per-vertex strokes/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/000.png b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/000.png
new file mode 100644
index 0000000000..87df4ea7b1
Binary files /dev/null and b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/000.png differ
diff --git a/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/metadata.json b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/Shape drawing/WebGL mode/Texture coordinates/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/000.png b/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/000.png
new file mode 100644
index 0000000000..ddc88b1044
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/metadata.json b/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/3DModel/OBJ model with MTL file displays diffuse colors correctly/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/000.png b/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/000.png
new file mode 100644
index 0000000000..bbf407af53
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/metadata.json b/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/3DModel/Object with different texture coordinates per use of vertex keeps the coordinates intact/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/000.png b/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/000.png
new file mode 100644
index 0000000000..28dd2a7fd5
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/metadata.json b/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/3DModel/Object with no colors takes on fill color/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/000.png b/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/000.png
new file mode 100644
index 0000000000..f56c898bc5
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/metadata.json b/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/Camera/2D objects maintain correct size/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/000.png b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/000.png
new file mode 100644
index 0000000000..d4000e5a14
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/001.png b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/001.png
new file mode 100644
index 0000000000..788178ce2f
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/001.png differ
diff --git a/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/metadata.json b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/metadata.json
new file mode 100644
index 0000000000..ebf58a6cb0
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/Camera/Custom camera before and after resize/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 2
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/000.png b/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/000.png
new file mode 100644
index 0000000000..f6b1feb5b8
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/metadata.json b/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/Lights/Fill color and default ambient material/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/000.png b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/000.png
new file mode 100644
index 0000000000..c2c2842507
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/metadata.json b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/FillShader/metadata.json
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/000.png b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/000.png
new file mode 100644
index 0000000000..135079c7f7
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/metadata.json b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/ImageShader/metadata.json
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/000.png b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/000.png
new file mode 100644
index 0000000000..398d95eca4
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/metadata.json b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/ShaderFunctionality/StrokeShader/metadata.json
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/000.png b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/000.png
new file mode 100644
index 0000000000..197629c93f
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/metadata.json b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer sized differently from the main canvas/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/000.png b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/000.png
new file mode 100644
index 0000000000..197629c93f
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/metadata.json b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/filter/On a framebuffer/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/filter/On the main canvas/000.png b/test/unit/visual/screenshots/WebGL/filter/On the main canvas/000.png
new file mode 100644
index 0000000000..176f683c62
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/filter/On the main canvas/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/filter/On the main canvas/metadata.json b/test/unit/visual/screenshots/WebGL/filter/On the main canvas/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/filter/On the main canvas/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/000.png b/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/000.png
new file mode 100644
index 0000000000..75018122a4
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/metadata.json b/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/vertexProperty/on QUADS shape mode/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/000.png b/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/000.png
new file mode 100644
index 0000000000..76ef1d98a2
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/metadata.json b/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/vertexProperty/on TESS shape mode/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/000.png b/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/000.png
new file mode 100644
index 0000000000..065fd3b563
Binary files /dev/null and b/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/000.png differ
diff --git a/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/metadata.json b/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/metadata.json
new file mode 100644
index 0000000000..2d4bfe30da
--- /dev/null
+++ b/test/unit/visual/screenshots/WebGL/vertexProperty/on buildGeometry outputs containing 3D primitives/metadata.json	
@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}
\ No newline at end of file