rebaseline pictureshader GM on GPU

Review URL: https://codereview.chromium.org/294103003

git-svn-id: http://skia.googlecode.com/svn/trunk@14810 2bbb7eff-a529-9590-31e7-b0007b416f81

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 56873f1..a58b6c9 100644 (file)
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
@@ -9940,7 +9940,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
       "reviewed-by-human": true
@@ -9949,7 +9949,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
       "reviewed-by-human": true

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 56873f1..a58b6c9 100644 (file)
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
@@ -9940,7 +9940,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
       "reviewed-by-human": true
@@ -9949,7 +9949,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
       "reviewed-by-human": true

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 96da405..64f0deb 100644 (file)
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -8936,7 +8936,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14438664037178742342
+          9763269945803838112
         ]
       ], 
       "reviewed-by-human": true
@@ -8945,7 +8945,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14438664037178742342
+          9763269945803838112
         ]
       ], 
       "reviewed-by-human": true

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 4d0ac03..8d02e2e 100644 (file)
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -8936,7 +8936,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14438664037178742342
+          9763269945803838112
         ]
       ], 
       "reviewed-by-human": true
@@ -8945,7 +8945,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14438664037178742342
+          9763269945803838112
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index 2880274..8f9d49b 100644 (file)
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -7284,7 +7284,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12233593549217735602
+          6480312308420165751
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index fa7ef3c..dbce57b 100644 (file)
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -12549,7 +12549,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2977622345381088779
+          16134738018745715217
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 4691711..518834d 100644 (file)
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -11422,7 +11422,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2977622345381088779
+          16134738018745715217
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 6e2589c..0a7197d 100644 (file)
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -12541,7 +12541,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2977622345381088779
+          16134738018745715217
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 0510e8a..12fab61 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -12968,7 +12968,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 50f2f4c..a12f3a8 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -11873,7 +11873,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 08816c9..2f81f4c 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -12976,7 +12976,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index a896a1f..569929a 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -11213,7 +11213,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index dcb6b4a..01c4f71 100644 (file)
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -12384,7 +12384,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 316dd5c..0ab33e1 100644 (file)
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -11572,7 +11572,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index fce14b0..d9a6670 100644 (file)
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -12384,7 +12384,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17107820280284794071
+          12439977133390197663
         ]
       ], 
       "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 e5a9857..ddb0ea6 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -14951,7 +14951,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12000175626728207556
+          9806917864829032009
         ]
       ], 
       "reviewed-by-human": true
@@ -14960,7 +14960,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          510503573614216863
+          1925902024016434685
         ]
       ], 
       "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 a34c954..9233bed 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -14954,7 +14954,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12000175626728207556
+          9806917864829032009
         ]
       ], 
       "reviewed-by-human": true
@@ -14963,7 +14963,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          510503573614216863
+          1925902024016434685
         ]
       ], 
       "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 84c2bb4..4d66098 100644 (file)
--- 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
@@ -14962,7 +14962,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9145862502009863105
+          18274605176124919546
         ]
       ], 
       "reviewed-by-human": true
@@ -14971,7 +14971,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14686128772703870572
+          16716769611359572173
         ]
       ], 
       "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 af43028..e455c58 100644 (file)
--- 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
@@ -14963,7 +14963,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9145862502009863105
+          18274605176124919546
         ]
       ], 
       "reviewed-by-human": true
@@ -14972,7 +14972,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14686128772703870572
+          16716769611359572173
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
index f6f6564..168ca73 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
@@ -11735,7 +11735,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1423899516760376304
+          16957814945817139278
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
index e766eb7..6430645 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
@@ -11735,7 +11735,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1423899516760376304
+          16957814945817139278
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
index 7925439..bbaa491 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
@@ -9574,7 +9574,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1423899516760376304
+          16957814945817139278
         ]
       ], 
       "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 9faef99..51b5a37 100644 (file)
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -15104,19 +15104,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_nvprmsaa4.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_pdf-poppler.png": {
       "allowed-digests": [

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 d7aaf8e..cbbac1f 100644 (file)
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -15104,19 +15104,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_nvprmsaa4.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_pdf-poppler.png": {
       "allowed-digests": [

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 d94ad74..12667da 100644 (file)
--- 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
@@ -15104,19 +15104,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_nvprmsaa4.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_pdf-poppler.png": {
       "allowed-digests": [

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 c5fa5bb..380aa4b 100644 (file)
--- 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
@@ -15104,19 +15104,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16068130794510825896
+          14694612130825938684
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_nvprmsaa4.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15881700783330850304
+          10380483174533663495
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshader_pdf-poppler.png": {
       "allowed-digests": [