diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-01-17 10:16:06 -0500 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2017-01-17 15:54:45 +0000 |
| commit | b5a1d41cc7d4995d473024a1a13020ad06870957 (patch) | |
| tree | dda3dd0d422bcd9501abca743ed02b13f4feb619 /src/splicer | |
| parent | fd146aa1dd8ea2d83396bb3a19c7556d9297a5e0 (diff) | |
SkSplicer: fix a typo in srcover stage.
Change-Id: Iafd23c860395587c77cd412a3b522ba851b4570d
Reviewed-on: https://skia-review.googlesource.com/7107
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/splicer')
| -rw-r--r-- | src/splicer/SkSplicer_generated.h | 12 | ||||
| -rw-r--r-- | src/splicer/SkSplicer_stages.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/splicer/SkSplicer_generated.h b/src/splicer/SkSplicer_generated.h index 228f8ff603..e08c428a6e 100644 --- a/src/splicer/SkSplicer_generated.h +++ b/src/splicer/SkSplicer_generated.h @@ -32,7 +32,7 @@ static const unsigned int kSplice_srcover[] = { 0x4e24ce00, // fmla v0.4s, v16.4s, v4.4s 0x4e25ce01, // fmla v1.4s, v16.4s, v5.4s 0x4e26ce02, // fmla v2.4s, v16.4s, v6.4s - 0x4e26ce03, // fmla v3.4s, v16.4s, v6.4s + 0x4e27ce03, // fmla v3.4s, v16.4s, v7.4s }; static const unsigned int kSplice_dstover[] = { 0x91001068, // add x8, x3, #0x4 @@ -41,7 +41,7 @@ static const unsigned int kSplice_dstover[] = { 0x4e20ce04, // fmla v4.4s, v16.4s, v0.4s 0x4e21ce05, // fmla v5.4s, v16.4s, v1.4s 0x4e22ce06, // fmla v6.4s, v16.4s, v2.4s - 0x4e22ce07, // fmla v7.4s, v16.4s, v2.4s + 0x4e23ce07, // fmla v7.4s, v16.4s, v3.4s }; static const unsigned int kSplice_clamp_0[] = { 0x6f00e410, // movi v16.2d, #0x0 @@ -382,7 +382,7 @@ static const unsigned int kSplice_srcover[] = { 0xf2040c30, // vfma.f32 d0, d4, d16 0xf2051c30, // vfma.f32 d1, d5, d16 0xf2062c30, // vfma.f32 d2, d6, d16 - 0xf2063c30, // vfma.f32 d3, d6, d16 + 0xf2073c30, // vfma.f32 d3, d7, d16 }; static const unsigned int kSplice_dstover[] = { 0xe283c004, // add ip, r3, #4 @@ -391,7 +391,7 @@ static const unsigned int kSplice_dstover[] = { 0xf2004c30, // vfma.f32 d4, d0, d16 0xf2015c30, // vfma.f32 d5, d1, d16 0xf2026c30, // vfma.f32 d6, d2, d16 - 0xf2027c30, // vfma.f32 d7, d2, d16 + 0xf2037c30, // vfma.f32 d7, d3, d16 }; static const unsigned int kSplice_clamp_0[] = { 0xf2c00010, // vmov.i32 d16, #0 @@ -756,7 +756,7 @@ static const unsigned char kSplice_srcover[] = { 0xc4,0xc2,0x5d,0xb8,0xc0, // vfmadd231ps %ymm8,%ymm4,%ymm0 0xc4,0xc2,0x55,0xb8,0xc8, // vfmadd231ps %ymm8,%ymm5,%ymm1 0xc4,0xc2,0x4d,0xb8,0xd0, // vfmadd231ps %ymm8,%ymm6,%ymm2 - 0xc4,0xc2,0x4d,0xb8,0xd8, // vfmadd231ps %ymm8,%ymm6,%ymm3 + 0xc4,0xc2,0x45,0xb8,0xd8, // vfmadd231ps %ymm8,%ymm7,%ymm3 }; static const unsigned char kSplice_dstover[] = { 0xc4,0x62,0x7d,0x18,0x41,0x04, // vbroadcastss 0x4(%rcx),%ymm8 @@ -764,7 +764,7 @@ static const unsigned char kSplice_dstover[] = { 0xc4,0xc2,0x7d,0xb8,0xe0, // vfmadd231ps %ymm8,%ymm0,%ymm4 0xc4,0xc2,0x75,0xb8,0xe8, // vfmadd231ps %ymm8,%ymm1,%ymm5 0xc4,0xc2,0x6d,0xb8,0xf0, // vfmadd231ps %ymm8,%ymm2,%ymm6 - 0xc4,0xc2,0x6d,0xb8,0xf8, // vfmadd231ps %ymm8,%ymm2,%ymm7 + 0xc4,0xc2,0x65,0xb8,0xf8, // vfmadd231ps %ymm8,%ymm3,%ymm7 }; static const unsigned char kSplice_clamp_0[] = { 0xc4,0x41,0x3c,0x57,0xc0, // vxorps %ymm8,%ymm8,%ymm8 diff --git a/src/splicer/SkSplicer_stages.cpp b/src/splicer/SkSplicer_stages.cpp index 2d83996f7d..935995b29d 100644 --- a/src/splicer/SkSplicer_stages.cpp +++ b/src/splicer/SkSplicer_stages.cpp @@ -163,7 +163,7 @@ STAGE(srcover) { r = fma(dr, A, r); g = fma(dg, A, g); b = fma(db, A, b); - a = fma(db, A, a); + a = fma(da, A, a); } STAGE(dstover) { srcover_k(x,limit,ctx,k, dr,dg,db,da, r,g,b,a); } |