Rebaseline from recent gpu optimization changes
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/408203002
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 28f60da..b2ccd01 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -7338,7 +7338,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 14864763259786294626
+ 15533171637285737420
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
index 4b86055..159f75b 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -7330,7 +7330,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 14864763259786294626
+ 15533171637285737420
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
index f7ef924..a088cf0 100644
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
@@ -7843,10 +7843,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"gradients_view_perspective_nvprmsaa4.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
index f7ef924..a088cf0 100644
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
@@ -7843,10 +7843,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"gradients_view_perspective_nvprmsaa4.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
index c65df41..de68480 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -9302,17 +9302,19 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1214323161004682693
+ 2345997695698587496
]
- ]
+ ],
+ "reviewed-by-human": true
},
"radial_gradient2_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 517817170355194916
+ 13265214489338924633
]
- ]
+ ],
+ "reviewed-by-human": true
},
"radial_gradient_565.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
index f310039..80e4fb6 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -9302,17 +9302,19 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1214323161004682693
+ 2345997695698587496
]
- ]
+ ],
+ "reviewed-by-human": true
},
"radial_gradient2_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 517817170355194916
+ 13265214489338924633
]
- ]
+ ],
+ "reviewed-by-human": true
},
"radial_gradient_565.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
index 5fa5b1a..d7e4b3e 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -5210,7 +5210,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 14930897081171395685
+ 13837779357393426492
]
],
"ignore-failure": false,
@@ -8641,7 +8641,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10255763987814493261
+ 1169777226871264424
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
index 5fa5b1a..d7e4b3e 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -5210,7 +5210,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 14930897081171395685
+ 13837779357393426492
]
],
"ignore-failure": false,
@@ -8641,7 +8641,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10255763987814493261
+ 1169777226871264424
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index c61f1e2..f7fcfd5 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@@ -7312,7 +7312,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 274415068130026266
+ 10244615098040095474
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index c61f1e2..f7fcfd5 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -7312,7 +7312,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 274415068130026266
+ 10244615098040095474
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
index 0964ce0..a4e950a 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -8718,7 +8718,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 17085212712405221649
+ 5483074157359624611
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index 077b46c..ed586af 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -8718,7 +8718,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 17085212712405221649
+ 5483074157359624611
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
index 40a27f2..338daf4 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -11373,7 +11373,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
index 359e547..10131fb 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -11496,7 +11496,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
index beaa6de..4a6f53b 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@@ -11540,7 +11540,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
index ec1d183..0da741c 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
@@ -11544,7 +11544,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index e921bdb..f3227d7 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -3747,10 +3747,11 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4841496337918692008
+ 10208615534534427054
]
],
- "ignore-failure": true
+ "ignore-failure": true,
+ "reviewed-by-human": true
},
"complexclip2_path_bw_pdf-poppler.png": {
"allowed-digests": [
@@ -3873,10 +3874,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7461094591079150540
+ 14745371879903012446
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 7b505f3..b764cb5 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -3281,7 +3281,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4239186053623522092
+ 4295657416679509254
]
],
"reviewed-by-human": true
@@ -3455,13 +3455,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5322076506213727769
+ 2234950304049838739
]
],
- "bugs": [
- 2146
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_565.png": {
"allowed-digests": [
@@ -3536,13 +3533,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9063602190207242061
+ 7024591397239428237
]
],
- "bugs": [
- 2146
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_bw_pdf-poppler.png": {
"allowed-digests": [
@@ -3688,13 +3682,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7214726488801362480
+ 14741022433395837133
]
],
- "bugs": [
- 2146
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_pdf-poppler.png": {
"allowed-digests": [
@@ -7721,7 +7712,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13227264184599830206
+ 16913545736601487804
]
],
"reviewed-by-human": true
@@ -8067,7 +8058,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6089012304980605252
+ 13045675692080251872
]
],
"reviewed-by-human": true
@@ -12161,7 +12152,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 2947983991092664961
+ 2904019594945473810
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
index 03eef67..912531c 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@@ -3751,10 +3751,11 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4841496337918692008
+ 10208615534534427054
]
],
- "ignore-failure": true
+ "ignore-failure": true,
+ "reviewed-by-human": true
},
"complexclip2_path_bw_pdf-poppler.png": {
"allowed-digests": [
@@ -3877,10 +3878,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7461094591079150540
+ 14745371879903012446
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
index 03eef67..912531c 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@@ -3751,10 +3751,11 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4841496337918692008
+ 10208615534534427054
]
],
- "ignore-failure": true
+ "ignore-failure": true,
+ "reviewed-by-human": true
},
"complexclip2_path_bw_pdf-poppler.png": {
"allowed-digests": [
@@ -3877,10 +3878,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7461094591079150540
+ 14745371879903012446
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
index bc11b1c..19a422b 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -11446,7 +11446,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
index fece924..acc5e94 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -11446,7 +11446,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
index b67c3d7..efe5d49 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@@ -11446,7 +11446,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
index a4cb856..96d85c4 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
@@ -11446,7 +11446,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12251179949487160659
+ 16307177227728636543
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index d8c0476..c97a0b9 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -33,18 +33,6 @@
## epoger will rebaseline by 25 Dec 2013
#gradtext
-# egdaniel: removing a gpu shader optimization causes some single pixel changes in gm
-# cl: https://codereview.chromium.org/375823005/#ps210001
-coloremoji
-complexclip2
-complexclip2_path_bw
-complexclip2_rrect_bw
-gradients_view_perspective
-imagefiltersbase
-inverse_paths
-xfermodes3
-verylargebitmap
-
# reed: bitmapfilters changed (labels) with hide_config CL, just need rebaselines
bitmapfilters
