From fc9eef4b4306145f158678f8fe3f78a3fb04d6c7 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 20 May 2014 18:57:34 +0000 Subject: [PATCH] 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 --- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 8 ++++---- .../expected-results.json | 8 ++++---- .../expected-results.json | 8 ++++---- .../expected-results.json | 8 ++++---- 26 files changed, 46 insertions(+), 46 deletions(-) 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 56873f1251..a58b6c9fbe 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 @@ -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 56873f1251..a58b6c9fbe 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 @@ -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 96da405753..64f0deb364 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 @@ -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 4d0ac03d60..8d02e2ec86 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 @@ -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 2880274907..8f9d49bd54 100644 --- 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 fa7ef3ca6d..dbce57b172 100644 --- 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 4691711746..518834d30e 100644 --- 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 6e2589c5a5..0a7197d295 100644 --- 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 0510e8acbe..12fab61577 100644 --- 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 50f2f4cc00..a12f3a8c84 100644 --- 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 08816c9b9c..2f81f4cdea 100644 --- 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 a896a1f6da..569929a065 100644 --- 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 dcb6b4a260..01c4f71eba 100644 --- 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 316dd5c369..0ab33e16a9 100644 --- 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 fce14b0d07..d9a66702e4 100644 --- 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 e5a9857d6a..ddb0ea6e96 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 @@ -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 a34c954df3..9233bed5e4 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 @@ -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 84c2bb449e..4d66098e7b 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 @@ -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 af430288a3..e455c58ca1 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 @@ -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 f6f6564523..168ca730a0 100644 --- 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 e766eb7a2f..6430645d5d 100644 --- 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 7925439128..bbaa491d65 100644 --- 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 9faef99ad7..51b5a37091 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 @@ -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 d7aaf8e2ca..cbbac1f8a6 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 @@ -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 d94ad74c08..12667da35d 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 @@ -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 c5fa5bbe2e..380aa4b028 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 @@ -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": [