rebase nvpr after ds on stack
TBR=
BUG=skia:
Review URL: https://codereview.chromium.org/726103004
diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
index 55af475..9a0aefb 100644
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
@@ -1471,10 +1471,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10895255954294537598
+ 11145869224897143526
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"clamped_gradients_565.png": {
"allowed-digests": [
@@ -2326,10 +2326,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 2618721010833979939
+ 17135155496855937792
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_bw_565.png": {
"allowed-digests": [
@@ -2371,10 +2371,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5765718557844909990
+ 1524267626407772630
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rect_aa_565.png": {
"allowed-digests": [
@@ -2461,10 +2461,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3072745735157512087
+ 5835330659301517240
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_565.png": {
"allowed-digests": [
@@ -2506,10 +2506,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5371709705048813809
+ 9782370866600319710
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip_aa_565.png": {
"allowed-digests": [
@@ -10320,10 +10320,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"peekpixels_565.png": {
"allowed-digests": [
@@ -12012,10 +12012,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16759061850730950379
+ 14876551720224189166
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"simpleaaclip_rect_565.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
index 691e567..2c6d3b7 100644
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
@@ -1471,10 +1471,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10895255954294537598
+ 11145869224897143526
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"clamped_gradients_565.png": {
"allowed-digests": [
@@ -2326,10 +2326,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 2618721010833979939
+ 17135155496855937792
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_bw_565.png": {
"allowed-digests": [
@@ -2371,10 +2371,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5765718557844909990
+ 1524267626407772630
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rect_aa_565.png": {
"allowed-digests": [
@@ -2461,10 +2461,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3072745735157512087
+ 5835330659301517240
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_bw_565.png": {
"allowed-digests": [
@@ -2506,10 +2506,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5371709705048813809
+ 9782370866600319710
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip_aa_565.png": {
"allowed-digests": [
@@ -9960,11 +9960,11 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7833653665942395917
+ 7201952066569021157
]
],
"ignore-failure": true,
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"patch_primitive_565.png": {
"allowed-digests": [
@@ -10321,10 +10321,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"peekpixels_565.png": {
"allowed-digests": [
@@ -11968,10 +11968,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16759061850730950379
+ 14876551720224189166
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"simpleaaclip_rect_565.png": {
"allowed-digests": [
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 18f607c..e54eb6f 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
@@ -4775,7 +4775,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -5968,13 +5968,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6028,7 +6025,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6160,13 +6157,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6229,7 +6223,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16667,13 +16661,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -19162,7 +19153,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 316799210449981670
+ 11244077614165978296
]
],
"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 84c8ead..a6e9c3d 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
@@ -4774,7 +4774,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -5967,13 +5967,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6027,7 +6024,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6159,13 +6156,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6228,7 +6222,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16824,13 +16818,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -19394,7 +19385,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 316799210449981670
+ 11244077614165978296
]
],
"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 ebf543e..36a9caa 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
@@ -4831,7 +4831,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6024,13 +6024,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6084,7 +6081,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6216,13 +6213,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6285,7 +6279,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16779,13 +16773,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -19290,7 +19281,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 316799210449981670
+ 11244077614165978296
]
],
"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 798ee9a..c35fcb9 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
@@ -4831,7 +4831,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6024,13 +6024,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6084,7 +6081,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6216,13 +6213,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_rrect_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6285,7 +6279,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16783,13 +16777,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "bugs": [
- 2325
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -19384,7 +19375,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 316799210449981670
+ 11244077614165978296
]
],
"reviewed-by-human": true
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 33b3c78..32d71a2 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
@@ -4828,7 +4828,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6007,10 +6007,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6076,7 +6076,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6211,7 +6211,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
"reviewed-by-human": true
@@ -6265,7 +6265,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16298,10 +16298,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -18786,7 +18786,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6453538714645879627
+ 7936644779604297813
]
],
"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 6a6d1be..d0ff44e 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
@@ -4828,7 +4828,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6007,10 +6007,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6076,7 +6076,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6211,7 +6211,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
"reviewed-by-human": true
@@ -6265,7 +6265,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16298,10 +16298,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -18786,7 +18786,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6453538714645879627
+ 7936644779604297813
]
],
"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 3a349c0..e066f06 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
@@ -4828,7 +4828,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6007,10 +6007,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6076,7 +6076,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6211,7 +6211,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
"reviewed-by-human": true
@@ -6265,7 +6265,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16298,10 +16298,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -18786,7 +18786,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6453538714645879627
+ 7936644779604297813
]
],
"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 dae60a9..5ed586a 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
@@ -4828,7 +4828,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10100482831257081037
+ 2182095870600702274
]
],
"reviewed-by-human": true
@@ -6007,10 +6007,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7949445150130678593
+ 13559457767177138569
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"complexclip2_path_aa_pdf-poppler.png": {
"allowed-digests": [
@@ -6076,7 +6076,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9033414804449138158
+ 5229800113218718256
]
],
"reviewed-by-human": true
@@ -6211,7 +6211,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5546897073650908874
+ 2069745905008794953
]
],
"reviewed-by-human": true
@@ -6265,7 +6265,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3489289663750123615
+ 7333384224920496533
]
],
"reviewed-by-human": true
@@ -16298,10 +16298,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11157237442918763566
+ 14726130787542239405
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"pathopsskpclip_pdf-poppler.png": {
"allowed-digests": [
@@ -18787,7 +18787,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6453538714645879627
+ 7936644779604297813
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index fbd6da5..00b1ac3 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -54,12 +54,3 @@
# cdalton https://codereview.chromium.org/712223002
# Pixels off by one from covering gradient fills with different bounding boxes
textblobshader
-
-# joshualitt nvprmsaa4
-simpleaaclip_path
-complexclip2_rrect_bw
-complexclip2_path_aa
-pathopsskpclip
-complexclip2_rrect_aa
-circular-clips
-complexclip2_path_bw
