Rebaseline GMs with missing expectated images and shadertext2 msaa

Review URL: https://codereview.chromium.org/308673002 git-svn-id: http://skia.googlecode.com/svn/trunk@14950 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-29 14:27:16 +00:00 · 2014-05-29 14:27:16 +00:00 · 5bf38e24ca
commit 5bf38e24ca
parent 0a92d8e1dc
32 changed files with 90 additions and 72 deletions
--- 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
@ -13944,7 +13944,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17513750812261997636
+          4039701180316548008
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -12698,7 +12698,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17513750812261997636
+          4039701180316548008
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -13936,7 +13936,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11411803051195971191
+          8388233011720328513
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -11999,7 +11999,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11411803051195971191
+          8388233011720328513
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -14390,7 +14390,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14042209323969188200
+          9408309760166687700
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -13211,7 +13211,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14042209323969188200
+          9408309760166687700
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -14398,7 +14398,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6060538077871099936
+          6343855064436115941
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -12479,7 +12479,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6060538077871099936
+          6343855064436115941
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -13719,7 +13719,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7542007492325013368
+          8978465217429079738
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -12823,7 +12823,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7542007492325013368
+          8978465217429079738
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -13719,7 +13719,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7716811278337640131
+          11943435293466893439
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -14097,7 +14097,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7716811278337640131
+          11943435293466893439
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -9904,12 +9904,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15470714396621126342
+          9447761248334139841
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "getpostextpath_nvprmsaa4.png": {
@ -16283,7 +16280,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4744541246163447516
+          17773646925429384088
        ]
      ], 
      "reviewed-by-human": true
@ -16292,7 +16289,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10197093962733292494
+          2415805639447437786
        ]
      ], 
      "reviewed-by-human": true
@ -16301,7 +16298,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17791550814890831442
+          13374125976246952627
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@ -9937,12 +9937,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15470714396621126342
+          9447761248334139841
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "getpostextpath_nvprmsaa4.png": {
@ -12274,6 +12271,24 @@
      ], 
      "reviewed-by-human": true
    }, 
+    "imagefiltersscaled_565-pipe cross-process.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          7766171136569007958
+        ]
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "imagefiltersscaled_565-serialize.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          7766171136569007958
+        ]
+      ], 
+      "reviewed-by-human": false
+    }, 
    "imagefiltersscaled_565.png": {
      "allowed-digests": [
        [
@ -12283,6 +12298,24 @@
      ], 
      "reviewed-by-human": true
    }, 
+    "imagefiltersscaled_8888-pipe cross-process.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          2700246532112245179
+        ]
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "imagefiltersscaled_8888-serialize.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16251317014161141240
+        ]
+      ], 
+      "reviewed-by-human": false
+    }, 
    "imagefiltersscaled_8888.png": {
      "allowed-digests": [
        [
@ -16385,7 +16418,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4744541246163447516
+          17773646925429384088
        ]
      ], 
      "reviewed-by-human": true
@ -16394,7 +16427,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10197093962733292494
+          12366755253801250205
        ]
      ], 
      "reviewed-by-human": true
@ -16403,7 +16436,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17791550814890831442
+          17518799550679467287
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -296,12 +296,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12660830118514636023
+          12346957912287937323
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "arcofzorro_nvprmsaa4.png": {
@ -10080,12 +10077,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15470714396621126342
+          9447761248334139841
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "getpostextpath_nvprmsaa4.png": {
@ -16523,7 +16517,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5125318733783400385
+          8790110109815580358
        ]
      ], 
      "reviewed-by-human": true
@ -16532,7 +16526,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2143822795871671935
+          9290689085471276179
        ]
      ], 
      "reviewed-by-human": true
@ -16541,7 +16535,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8099551217234529058
+          4702027525692342270
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -296,12 +296,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12660830118514636023
+          12346957912287937323
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "arcofzorro_nvprmsaa4.png": {
@ -10080,12 +10077,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15470714396621126342
+          9447761248334139841
        ]
      ], 
-      "bugs": [
-        2325
-      ], 
      "reviewed-by-human": false
    }, 
    "getpostextpath_nvprmsaa4.png": {
@ -16617,7 +16611,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5125318733783400385
+          8790110109815580358
        ]
      ], 
      "reviewed-by-human": true
@ -16626,7 +16620,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2143822795871671935
+          15120900084396668830
        ]
      ], 
      "reviewed-by-human": true
@ -16635,7 +16629,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18236885096090887711
+          4702027525692342270
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -12955,7 +12955,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7842003984398750638
+          16284294043079348128
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -10612,7 +10612,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5117505556807733747
+          7446656361779213026
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -10609,7 +10609,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17999243242135324355
+          15634384903887720717
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -12955,7 +12955,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7842003984398750638
+          16284294043079348128
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -10607,7 +10607,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5117505556807733747
+          7446656361779213026
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -11184,7 +11184,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17179261260729230435
+          8821978295492248077
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -10615,7 +10615,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1260741777460821297
+          8053365202385311069
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -10615,7 +10615,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1260741777460821297
+          8053365202385311069
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -16722,7 +16722,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1127004971154957997
+          11081789658344209328
        ]
      ], 
      "reviewed-by-human": true
@ -16731,7 +16731,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11415907613654257389
+          6304960047606523701
        ]
      ], 
      "reviewed-by-human": true
@ -16740,7 +16740,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16341665841246227362
+          17371546210615613853
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@ -16722,7 +16722,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1127004971154957997
+          11081789658344209328
        ]
      ], 
      "reviewed-by-human": true
@ -16731,7 +16731,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11415907613654257389
+          6304960047606523701
        ]
      ], 
      "reviewed-by-human": true
@ -16740,7 +16740,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16341665841246227362
+          17371546210615613853
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -16722,7 +16722,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1127004971154957997
+          11081789658344209328
        ]
      ], 
      "reviewed-by-human": true
@ -16731,7 +16731,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11415907613654257389
+          6304960047606523701
        ]
      ], 
      "reviewed-by-human": true
@ -16740,7 +16740,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16341665841246227362
+          17371546210615613853
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -16723,7 +16723,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1127004971154957997
+          11081789658344209328
        ]
      ], 
      "reviewed-by-human": true
@ -16732,7 +16732,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11415907613654257389
+          6304960047606523701
        ]
      ], 
      "reviewed-by-human": true
@ -16741,7 +16741,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16341665841246227362
+          17371546210615613853
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@ -11491,7 +11491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12850935511712893128
+          12858821977237734612
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@ -11491,7 +11491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12850935511712893128
+          12858821977237734612
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -11491,7 +11491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12850935511712893128
+          12858821977237734612
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -11491,7 +11491,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12850935511712893128
+          12858821977237734612
        ]
      ], 
      "reviewed-by-human": true