From c1188aacd50c2e77ded8fddedd7d27c02d5a9e5d Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 7 Oct 2014 05:56:24 -0700 Subject: [PATCH] Added more msaa blurring rebaselines & a suppression These are rebaselines for: Create MSAA render target for blur mask texture - https://codereview.chromium.org/616923004 BUG=skia:2995 TBR=bsalomon@google.com NOTRY=true Review URL: https://codereview.chromium.org/628813003 --- .../expected-results.json | 27 ++++++------- .../expected-results.json | 44 ++++++++++----------- .../expected-results.json | 45 +++++++++------------- .../expected-results.json | 45 +++++++++------------- .../expected-results.json | 45 +++++++++------------- expectations/gm/ignored-tests.txt | 2 + 6 files changed, 90 insertions(+), 118 deletions(-) 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 f130dc8..f3bd4e5 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 @@ -414,7 +414,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 16508684429113109899 + 7934149381931836538 ] ], "reviewed-by-human": true @@ -847,13 +847,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 9867627344966414537 + 14312149710266134937 ] ], - "bugs": [ - 2762 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blend_gpu.png": { "allowed-digests": [ @@ -904,10 +901,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7279256031086971938 + 14565713740382103170 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurquickreject_565.png": { "allowed-digests": [ @@ -2681,10 +2678,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10426400083921889194 + 17479474044354893809 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH[100x100]-unevenCorners_565.png": { "allowed-digests": [ @@ -2753,7 +2750,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 9323354551120439554 + 16999601652961192407 ] ], "reviewed-by-human": true @@ -5029,7 +5026,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 14484858848664747251 + 11343495394983612906 ] ], "ignore-failure": false, @@ -11608,7 +11605,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 8411590397840305868 + 590591673143621095 ] ], "reviewed-by-human": true @@ -11642,10 +11639,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 14741463111103498316 + 4807547432861546230 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "spritebitmap_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json index 7332c16..1446fcf 100644 --- a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json +++ b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json @@ -427,7 +427,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 6463895742034431573 + 15534322254918952736 ] ], "reviewed-by-human": true @@ -436,7 +436,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 17909315077536907276 + 4427708840944031115 ] ], "reviewed-by-human": true @@ -922,7 +922,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7798430527876011187 + 10087601835957301015 ] ], "reviewed-by-human": true @@ -931,7 +931,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 527932406326671983 + 7062546055367820019 ] ], "reviewed-by-human": true @@ -967,7 +967,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 15077952026473594665 + 15675367393350089223 ] ], "reviewed-by-human": true @@ -976,10 +976,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7277028211493676521 + 15469978486678003138 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurquickreject_565.png": { "allowed-digests": [ @@ -1147,7 +1147,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 1907907583112016008 + 6850711322357366834 ] ], "reviewed-by-human": true @@ -1156,10 +1156,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 12210721514739080593 + 3232455322012377817 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurs_565.png": { "allowed-digests": [ @@ -1192,19 +1192,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 17360690807365040182 + 13019625347870849585 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurs_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 13137504778664331730 + 8022102071788789190 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "chrome_gradtext1_565.png": { "allowed-digests": [ @@ -3739,7 +3739,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5041644101832918027 + 13000810263341847241 ] ], "reviewed-by-human": true @@ -3748,7 +3748,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 12878478093979926276 + 12075193530513857238 ] ], "reviewed-by-human": true @@ -11347,7 +11347,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11504299822100144685 + 17590451671735349800 ] ], "reviewed-by-human": true @@ -11356,10 +11356,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4323854140016112056 + 14796861876070879358 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_565.png": { "allowed-digests": [ @@ -11392,7 +11392,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4851170883353423359 + 6255611555967465064 ] ], "reviewed-by-human": true @@ -11401,10 +11401,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 1075111322101840115 + 797988094958860326 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "spritebitmap_565.png": { "allowed-digests": [ 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 af925c5..2e7cd39 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 @@ -700,7 +700,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 6463895742034431573 + 15534322254918952736 ] ], "reviewed-by-human": true @@ -709,7 +709,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3635090355061860852 + 15938302817607285178 ] ], "reviewed-by-human": true @@ -1453,13 +1453,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13014075482864288220 + 9747942328298350316 ] ], - "bugs": [ - 2762 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "bleed_nvprmsaa4.png": { "allowed-digests": [ @@ -1516,10 +1513,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3887930859966225568 + 11926051639372103033 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurcircles_nvprmsaa4.png": { "allowed-digests": [ @@ -4324,19 +4321,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 1907907583112016008 + 6850711322357366834 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH-100x100-unevenCorners_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12210721514739080593 + 3232455322012377817 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH[100x100]-unevenCorners_565.png": { "allowed-digests": [ @@ -4438,7 +4435,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10791718083342670060 + 4952161504302820728 ] ], "reviewed-by-human": true @@ -4447,7 +4444,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11226069113236569409 + 6455343208956184504 ] ], "reviewed-by-human": true @@ -8072,12 +8069,9 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 17938573218167752738 + 8756560352715433074 ] ], - "bugs": [ - 1935 - ], "reviewed-by-human": true }, "drawbitmapmatrix_nvprmsaa4.png": { @@ -18319,7 +18313,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 262766361653694190 + 14949060004124505706 ] ], "reviewed-by-human": true @@ -18382,22 +18376,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4851170883353423359 + 6255611555967465064 ] ], - "bugs": [ - 1935 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 1075111322101840115 + 797988094958860326 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_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 618fdad..290c48f 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 @@ -700,7 +700,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 6463895742034431573 + 15534322254918952736 ] ], "reviewed-by-human": true @@ -709,7 +709,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3635090355061860852 + 15938302817607285178 ] ], "reviewed-by-human": true @@ -1453,13 +1453,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13014075482864288220 + 9747942328298350316 ] ], - "bugs": [ - 2762 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "bleed_nvprmsaa4.png": { "allowed-digests": [ @@ -1516,10 +1513,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3887930859966225568 + 11926051639372103033 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurcircles_nvprmsaa4.png": { "allowed-digests": [ @@ -4324,19 +4321,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 1907907583112016008 + 6850711322357366834 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH-100x100-unevenCorners_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12210721514739080593 + 3232455322012377817 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH[100x100]-unevenCorners_565.png": { "allowed-digests": [ @@ -4438,7 +4435,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10791718083342670060 + 4952161504302820728 ] ], "reviewed-by-human": true @@ -4447,7 +4444,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11226069113236569409 + 6455343208956184504 ] ], "reviewed-by-human": true @@ -8072,12 +8069,9 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 17938573218167752738 + 8756560352715433074 ] ], - "bugs": [ - 1935 - ], "reviewed-by-human": true }, "drawbitmapmatrix_nvprmsaa4.png": { @@ -18319,7 +18313,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 262766361653694190 + 14949060004124505706 ] ], "reviewed-by-human": true @@ -18382,22 +18376,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4851170883353423359 + 6255611555967465064 ] ], - "bugs": [ - 1935 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 1075111322101840115 + 797988094958860326 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_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 66b8f2f..f9be310 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 @@ -700,7 +700,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 6463895742034431573 + 15534322254918952736 ] ], "reviewed-by-human": true @@ -709,7 +709,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3635090355061860852 + 15938302817607285178 ] ], "reviewed-by-human": true @@ -1453,13 +1453,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13014075482864288220 + 9747942328298350316 ] ], - "bugs": [ - 2762 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "bleed_nvprmsaa4.png": { "allowed-digests": [ @@ -1516,10 +1513,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3887930859966225568 + 11926051639372103033 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurcircles_nvprmsaa4.png": { "allowed-digests": [ @@ -4324,19 +4321,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 1907907583112016008 + 6850711322357366834 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH-100x100-unevenCorners_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12210721514739080593 + 3232455322012377817 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "blurroundrect-WH[100x100]-unevenCorners_565.png": { "allowed-digests": [ @@ -4438,7 +4435,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10791718083342670060 + 4952161504302820728 ] ], "reviewed-by-human": true @@ -4447,7 +4444,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11226069113236569409 + 6455343208956184504 ] ], "reviewed-by-human": true @@ -8072,12 +8069,9 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 17938573218167752738 + 8756560352715433074 ] ], - "bugs": [ - 1935 - ], "reviewed-by-human": true }, "drawbitmapmatrix_nvprmsaa4.png": { @@ -18320,7 +18314,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 262766361653694190 + 14949060004124505706 ] ], "reviewed-by-human": true @@ -18383,22 +18377,19 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4851170883353423359 + 6255611555967465064 ] ], - "bugs": [ - 1935 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 1075111322101840115 + 797988094958860326 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "skbug1719_pdf-poppler.png": { "allowed-digests": [ diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 1a55cc3..1288a92 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -51,3 +51,5 @@ roundrects # rileya - https://codereview.chromium.org/516463005/ will rebaseline after bots cycle yuv_to_rgb_effect +# robertphillips - skia:2995 +blurrects -- 2.7.4