New GPU baselines for colormatrix GM.

TBR=halcanary@google.com BUG=skia: Review URL: https://codereview.chromium.org/198973003 git-svn-id: http://skia.googlecode.com/svn/trunk@13784 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-13 15:33:02 +00:00 · 2014-03-13 15:33:02 +00:00 · fb882d774e
commit fb882d774e
parent 7498d95bde
43 changed files with 52 additions and 57 deletions
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
@ -2565,7 +2565,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9179896739428124194
+          1575688773869978322
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@ -2565,7 +2565,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9179896739428124194
+          1575688773869978322
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -3202,7 +3202,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
        ]
      ], 
      "ignore-failure": false
@ -3211,7 +3211,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@ -3202,7 +3202,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
        ]
      ], 
      "ignore-failure": false
@ -3211,7 +3211,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@ -2779,7 +2779,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          637895803554466821
+          7201496349565256049
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@ -2779,7 +2779,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          637895803554466821
+          7201496349565256049
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@ -2453,7 +2453,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@ -2453,7 +2453,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@ -2491,7 +2491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@ -2491,7 +2491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
        ]
      ], 
      "bugs": [
--- 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
@ -4577,7 +4577,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4049,7 +4049,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4577,7 +4577,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@ -3725,7 +3725,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4916,7 +4916,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4472,7 +4472,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4916,7 +4916,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4076,7 +4076,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4642,7 +4642,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4366,7 +4366,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- 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
@ -4642,7 +4642,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@ -4234,7 +4234,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@ -3500,7 +3500,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@ -3500,7 +3500,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
@ -3500,7 +3500,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
@ -3500,7 +3500,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- 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
@ -4577,7 +4577,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
@ -3515,7 +3515,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -3497,7 +3497,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- 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
@ -4577,7 +4577,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- 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
@ -3515,7 +3515,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -3547,7 +3547,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3803776117583071141
+          1290342250623999108
        ]
      ], 
      "bugs": [
--- 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
@ -3497,7 +3497,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- 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
@ -3497,7 +3497,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -5578,7 +5578,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5590,7 +5590,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5602,7 +5602,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "reviewed-by-human": false
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@ -5578,7 +5578,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5590,7 +5590,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5602,7 +5602,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "reviewed-by-human": false
--- 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
@ -5578,7 +5578,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5590,7 +5590,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5602,7 +5602,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "reviewed-by-human": false
--- 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
@ -5578,7 +5578,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5590,7 +5590,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "bugs": [
@ -5602,7 +5602,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
        ]
      ], 
      "reviewed-by-human": false
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@ -3871,7 +3871,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@ -3871,7 +3871,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
@ -3871,7 +3871,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
@ -3871,7 +3871,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
        ]
      ], 
      "bugs": [
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@ -51,8 +51,3 @@ rrect_clip_aa
 # This change removes an API that this GM was testing. If/when it lands and sticks,
 # I will likely just delete the GM.
 canvas-layer-state
-
-# senorblanco: https://codereview.chromium.org/196133006/
-# The setYUV2RGB sample in transparent mode in this GM this test has always
-# drawn incorrectly on the GPU.  The change above fixes it.
-colormatrix