robertphillips
ba0055b290
Revert "Update fontmgr expectations."
...
This reverts commit ff4b56b2d5
.
R=bungeman@gmail.com
TBR=bungeman@gmail.com
NOTRY=true
NOTREECHECKS=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/406323004
2014-07-22 16:34:38 -07:00
bungeman
ff4b56b2d5
Update fontmgr expectations.
2014-07-22 18:21:24 -04:00
bungeman
33d134656e
Suppress fontmgr gm changes while Android catches up.
2014-07-22 16:02:58 -04:00
egdaniel
f7caacdbb7
Rebaseline from recent gpu optimization changes
...
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/408203002
2014-07-22 06:46:45 -07:00
egdaniel
02cafcc1bf
Remove gpu shader optimatization for solid white or trans black colors
...
Running test on the added bench which draws a grid of all white paths, all blue paths, or alternating checkered white/blue paths.
With optimization in (ms):
White Blue Checkered
Linux ~80 ~80 ~160
N7 ~800 ~1100 ~1500
Moto-e ~830 ~1100 ~2500
Without optimization in (ms):
White Blue Checkered
Linux ~80 ~80 ~80
N7 ~1100 ~1100 ~1100
Moto-e ~1100 ~1100 ~1500
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/5f78d2251a440443c9eaa321dad058d7a32bfef7
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/375823005
2014-07-21 11:37:28 -07:00
senorblanco
3a3eef4a63
New baselines for perlin noise changes.
...
Pixel results affected by ca6a7c2945
R=jcgregorio@google.com
TBR=jcgregorio@google.com
NOTRY=true
BUG=skia:
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/385643003
2014-07-10 10:52:21 -07:00
robertphillips
e6b28cf25b
Remove shadows suppression
...
The 'shadows' GM isn't appearing on the "Recent GM Failures" page. It might have been a blip.
R=jcgregorio@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/387533002
2014-07-10 07:57:16 -07:00
robertphillips
5fe23b357a
Add suppression for shadows test
...
R=jvanverth@google.com
TBR=jcgregorio@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/377403004
2014-07-09 14:24:00 -07:00
jvanverth
085f334c47
Update remaining expectations for https://codereview.chromium.org/337603008 .
...
TBR=bungeman@chromium.org
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/371003004
2014-07-07 08:44:46 -07:00
egdaniel
8119e6a85d
Rebaseline for gpu dashing4 now doing circle dashes
...
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/374623003
2014-07-07 06:28:44 -07:00
jvanverth
c6bbd82210
Ignore some GM images for https://codereview.chromium.org/337603008 .
...
R=bungeman@google.com
TBR=bungeman@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/361333002
2014-07-02 15:54:24 -07:00
jvanverth
23ff2a5d46
More expectation updates for https://codereview.chromium.org/337603008 .
...
R=bungeman@google.com
TBR=bungeman@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/368073002
2014-07-02 14:15:37 -07:00
mtklein
217daa7ec5
Revert of Remove the AA requirement for selecting GrEffect-based clipping. ( https://codereview.chromium.org/367013003/ )
...
Reason for revert:
We think this is breaking the roll.
Original issue's description:
> Remove the AA requirement for selecting GrEffect-based clipping.
>
> Also, optionally use the scissor for a bw clip rect element instead of an effect.
>
> Committed: https://skia.googlesource.com/skia/+/a73218bbbdcbe458651d10815e8d3b73d71b8e11
>
> Committed: https://skia.googlesource.com/skia/+/e9a729cb4d3f05b9c750dc1f63a9cc65b5659f04
R=robertphillips@google.com , bsalomon@google.com
TBR=bsalomon@google.com , robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/361313002
2014-07-02 12:55:21 -07:00
bsalomon
e9a729cb4d
Remove the AA requirement for selecting GrEffect-based clipping.
...
Also, optionally use the scissor for a bw clip rect element instead of an effect.
Committed: https://skia.googlesource.com/skia/+/a73218bbbdcbe458651d10815e8d3b73d71b8e11
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/367013003
2014-07-02 11:42:29 -07:00
jvanverth
5c76a0f1d1
Update some expectations for https://codereview.chromium.org/337603008 .
...
R=bungeman@google.com
TBR=bungeman@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/362373002
2014-07-02 11:33:07 -07:00
bsalomon
e1593862fe
Revert of Remove the AA requirement for selecting GrEffect-based clipping. ( https://codereview.chromium.org/367013003/ )
...
Reason for revert:
Assertion failing.
Original issue's description:
> Remove the AA requirement for selecting GrEffect-based clipping.
>
> Also, optionally use the scissor for a bw clip rect element instead of an effect.
>
> Committed: https://skia.googlesource.com/skia/+/a73218bbbdcbe458651d10815e8d3b73d71b8e11
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/369613002
2014-07-02 11:11:30 -07:00
bsalomon
a73218bbbd
Remove the AA requirement for selecting GrEffect-based clipping.
...
Also, optionally use the scissor for a bw clip rect element instead of an effect.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/367013003
2014-07-02 10:40:52 -07:00
egdaniel
f767e792b9
Add the ability for gpu to render dotted lines (dashed line, 0 on interval, round caps)
...
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/345113003
2014-07-02 06:21:34 -07:00
jvanverth
dc1cf66483
Remove A8_LCD luminance hack.
...
It no longer appears to be necessary, and the powf function is slowing down
Android text rendering.
R=bungeman@google.com , bsalomon@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/337603008
2014-07-01 13:43:00 -07:00
senorblanco
ca6a7c2945
Make perlin noise do CTM-correct scaling.
...
When drawing perlin noise, generate noise at the resolution determined
by CTM, not by the resolution at construction time. This required moving
the generation of PaintingData to getContext() and asNewEffect() for the
raster and GPU paths, respectively.
It also required adjusting the matrices used during rendering
to be translate-only.
R=sugoi@chromium.org , bsalomon@google.com
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/358903002
2014-06-27 13:35:52 -07:00
robertphillips
c8fd7b58c5
Remove suppression of distantclip image differences
...
R=rmistry@google.com , rmistry@chromium.org
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/349233004
2014-06-23 09:01:52 -07:00
krajcevski
912d809a85
Rebaseline after dithering change
...
TBR=bsalomon@google.com
BUG=skia:
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/347103003
2014-06-20 09:02:16 -07:00
krajcevski
f461a8fdf6
Simple GPU based dithering:
...
If dithering is turned on, apply an effect that filters the pixel through
the following pipeline:
for each channel c:
1. Compute quantized colors [low, high] that c is between
2. Pick high by flipping a coin weighted by (c - low)
R=bsalomon@google.com , egdaniel@google.com , robertphillips@google.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/321253002
2014-06-19 14:14:06 -07:00
egdaniel
00fb42704a
Rebaslines from recent dashing changes
...
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/339203003
2014-06-18 06:56:19 -07:00
reed
1777f233bd
unignore canvas-layer-state
...
TBR=
NOTRY=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/336273005
2014-06-18 05:47:45 -07:00
humper
4a24cd8ff4
Fifth attempt to land faster rect blur. Remove unnecessary conditionals from the shader.
...
approved over in https://codereview.chromium.org/331863006/ ; reuploading
because it had the wrong base url
BUG=skia:2095
R=bsalomon@google.com
TBR=bsalomon
Author: humper@google.com
Review URL: https://codereview.chromium.org/341543005
2014-06-17 13:39:31 -07:00
reed
0992d0764b
rebaseline after changing labels in bitmapfilters
...
TBR=
NOTRY=True
NOTREECHECKS=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/340583004
2014-06-17 12:31:49 -07:00
dandov
baa860c297
* Removed bitmapshaders from expectations/gm/ignored-tests.txt.
...
* Rebaseline bitmapshaders, gpu didn't produce the same images when using only alpha bitmaps
because it didn't consider the skpaint's color.
BUG=skia:2293
R=jvanverth@google.com
Author: dandov@google.com
Review URL: https://codereview.chromium.org/339923004
2014-06-17 11:21:46 -07:00
reed
12d4aa69b5
ignore bitmapfilters failures until we can rebaseline
...
TBR=
NOTRY=True
NOTREECHECKS=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/339153004
2014-06-17 10:28:08 -07:00
kevin.petit
cf2187267b
Armv8/64bit doesn't (apparently) need rebaselining
...
BUG=skia:
R=reed@google.com
NOTRY=True
Author: kevin.petit@arm.com
Review URL: https://codereview.chromium.org/334743009
2014-06-16 10:05:41 -07:00
senorblanco
9a8699f45c
New baselines for perlin noise tests affected by ce6a35.
...
New baselines for perlinnoise, imagefiltersclipped and
imagefiltersscaled GMs.
R=scroggo@google.com
TBR=scroggo
NOTRY=true
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/336703002
2014-06-12 14:31:57 -07:00
reed
2526f0e5fd
rebaselines for removal of unitmapper
...
TBR=
NOTRY=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/330513005
2014-06-12 12:53:01 -07:00
Stephen White
1b5e04ec5f
Add more tests to ignore-tests.txt.
...
Add imagefiltersclipped and imagefiltersscaled to ignored-tests.txt
until they can be rebaselined, since they're failing on Android after
https://codereview.chromium.org/332523006/ .
TBR=scroggo
BUG=skia:
Review URL: https://codereview.chromium.org/336663002
2014-06-12 15:51:46 -04:00
scroggo
e07c1ab408
Revert of third try at landing improved blur rect; this time with more correctness ( https://codereview.chromium.org/331443003/ )
...
Reason for revert:
Failing layout test: https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux/32762/layout-test-results/virtual/gpu/fast/canvas/canvas-draw-canvas-on-canvas-shadow-pretty-diff.html
Original issue's description:
> third try at landing improved blur rect; this time with more correctness
>
> BUG=skia:2095
> R=bsalomon@google.com
> TBR=bsalomon
>
> Committed: https://skia.googlesource.com/skia/+/72abfc2b4e7caead660f6b6a05e60d05eaf1a66f
R=bsalomon@google.com , reed@google.com , humper@google.com
TBR=bsalomon@google.com , humper@google.com , reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2095
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/333763002
2014-06-12 12:10:24 -07:00
senorblanco
ce6a354e12
Fix tiled perlin noise.
...
It turns out that the perlin implementation we inherited from WebKit
does not actually generate tileable noise (see Chromium bug
http://crbug.com/383495 ).
The main problem is that when generating coordinates for gradient
interpolation, it was attempting to wrap both x and (x + 1)
simultaneously at the tile boundary (that is, either both or neither
are wrapped). This obviously won't work, since along the tile seams,
(x + 1) should be wrapped, but x should not. The same is true in y.
This patch fixes both the CPU and GPU paths, renames some variables to
more closely match the spec, and modifies the perlin noise GM to
actually test tiling. (Note that the clipping the GM was doing was
removed, since it's superfluous: it used to be necessary for image
filters, but isn't anymore, and this isn't an image filter GM anyway.)
R=sugoi@google.com , sugoi
TBR=senorblanco
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/332523006
2014-06-12 11:24:20 -07:00
egdaniel
e61c411c12
Use vertex attributes for dash effect in gpu
...
This will allow us to batch dashed lines together when drawing. Also, this removes the need for
a coord transform matrix in the shader, thus we save the cost of uploading a new matrix uniform
everytime we do a simple transform to the dashed line we are drawing.
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/326103002
2014-06-12 10:24:21 -07:00
humper
72abfc2b4e
third try at landing improved blur rect; this time with more correctness
...
BUG=skia:2095
R=bsalomon@google.com
TBR=bsalomon
Author: humper@google.com
Review URL: https://codereview.chromium.org/331443003
2014-06-11 12:42:49 -07:00
reed
b0b1aa04ed
Revert of second try at landing improved blur rect ( https://codereview.chromium.org/325703002/ )
...
Reason for revert:
broke some fast/canvas layout tests
Original issue's description:
> second try at landing improved blur rect
>
> BUG=skia:2095
> TBR=bsalomon
>
> Committed: https://skia.googlesource.com/skia/+/e9ea0d6b7d59ac3b7e257281e545b24bcc0d2a76
R=bsalomon@google.com , reed@chromium.org , humper@google.com
TBR=bsalomon@google.com , humper@google.com , reed@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2095
Author: reed@google.com
Review URL: https://codereview.chromium.org/322423002
2014-06-11 07:26:23 -07:00
dandov
9de5b514d3
SkShader::asNewEffect Refactoring
...
The new signature is:
bool asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor, GrEffectRef** grEffect, const SkMatrix* localMatrixOrNull) const;
It will fix the hack for skcolorshader by modifying the GrColor parameter in SkGr::SkPaint2GrPaintShader.
BUG=skia:2646
R=jvanverth@google.com , bsalomon@google.com
Author: dandov@google.com
Review URL: https://codereview.chromium.org/318923005
2014-06-10 14:38:28 -07:00
humper
e9ea0d6b7d
second try at landing improved blur rect
...
BUG=skia:2095
R=bsalomon@google.com
TBR=bsalomon
Author: humper@google.com
Review URL: https://codereview.chromium.org/325703002
2014-06-09 14:35:21 -07:00
robertphillips
9f1c241e0d
Remove SkPicture::kUsePathBoundsForClip_RecordingFlag
...
The real question is whether we ever want to record a picture without using the path bounds for a conservative (but faster) clip answer?
R=reed@google.com , mtklein@google.com , djsollen@google.com , scroggo@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/316143003
2014-06-09 06:25:34 -07:00
jvanverth
d78a2fac37
Rollback of fe689c46
and all subsequent changes
...
BUG=skia:
R=humper@google.com
TBR=humper@google.com
NOTRY=True
NOTREECHECKS=True
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/324463005
2014-06-06 13:40:36 -07:00
jvanverth
a07213ac83
Disable bigblurs GM (for fe689c46a7
)
...
BUG=skia:
R=humper@google.com
TBR=humper@google.com
NOTRY=True
NOTREECHECKS=True
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/325453002
2014-06-06 11:59:26 -07:00
humper
ede6cfc0f5
Revert of Revert of another GM to ignore for blur rebaseline ( https://codereview.chromium.org/319943004/ )
...
Reason for revert:
Hopefully working now
Original issue's description:
> Revert of another GM to ignore for blur rebaseline (https://codereview.chromium.org/319203002/ )
>
> Reason for revert:
> Follow-on to fe689c46a7
, which needs to be reverted due to bot failures.
>
> Original issue's description:
> > another GM to ignore for blur rebaseline
> >
> > BUG=skia:
> > TBR=jvanverth
> > NOTRY=True
> > NOTREECHECKS=True
> >
> > Committed: https://skia.googlesource.com/skia/+/f131055929afb9c9671aee3e575c380d48c5ee4d
>
> TBR=humper@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f255de0fe160e33b340301859be1d9374c5607fe
R=jvanverth@google.com
TBR=jvanverth@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: humper@google.com
Review URL: https://codereview.chromium.org/324453004
2014-06-06 11:18:17 -07:00
jvanverth
f255de0fe1
Revert of another GM to ignore for blur rebaseline ( https://codereview.chromium.org/319203002/ )
...
Reason for revert:
Follow-on to fe689c46a7
, which needs to be reverted due to bot failures.
Original issue's description:
> another GM to ignore for blur rebaseline
>
> BUG=skia:
> TBR=jvanverth
> NOTRY=True
> NOTREECHECKS=True
>
> Committed: https://skia.googlesource.com/skia/+/f131055929afb9c9671aee3e575c380d48c5ee4d
R=humper@google.com
TBR=humper@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/319943004
2014-06-06 10:59:13 -07:00
humper
f131055929
another GM to ignore for blur rebaseline
...
BUG=skia:
TBR=jvanverth
NOTRY=True
NOTREECHECKS=True
Author: humper@google.com
Review URL: https://codereview.chromium.org/319203002
2014-06-06 10:36:02 -07:00
humper
fe689c46a7
Faster GPU rect blur that doesn't require computing vertical and horizontal
...
scanlines on the CPU first. Should make extremely large drop shadows fast
again.
BUG=skia:
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/316273004
2014-06-06 09:48:40 -07:00
kevin.petit
ea6b46b6c0
ARM Skia NEON patches - 39 - arm64 565 blitters
...
This enables all 565 blitters except S32A_D565_Opaque.
Here are some performance results:
S32_D565_Opaque:
================
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -18.37% | -13.04% |
+-------+------------+------------+
| 2 | -9.90% | -13.78% |
+-------+------------+------------+
| 4 | -8.28% | -6.77% |
+-------+------------+------------+
| 8 | 157.63% | 78.15% |
+-------+------------+------------+
| 16 | 72.67% | 44.81% |
+-------+------------+------------+
| 64 | 76.78% | 40.89% |
+-------+------------+------------+
| 256 | 73.85% | 36.05% |
+-------+------------+------------+
| 1024 | 75.73% | 36.70% |
+-------+------------+------------+
S32_D565_Blend:
===============
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -9.99% | -13.79% |
+-------+------------+------------+
| 2 | -9.17% | -6.74% |
+-------+------------+------------+
| 4 | -6.73% | -4.42% |
+-------+------------+------------+
| 8 | 163.31% | 112.82% |
+-------+------------+------------+
| 16 | 55.21% | 44.68% |
+-------+------------+------------+
| 64 | 54.09% | 41.99% |
+-------+------------+------------+
| 256 | 52.63% | 40.64% |
+-------+------------+------------+
| 1024 | 52.46% | 40.45% |
+-------+------------+------------+
S32A_D565_Blend:
================
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -5.88% | -6.06% |
+-------+------------+------------+
| 2 | -4.74% | -0.01% |
+-------+------------+------------+
| 4 | -5.42% | -3.03% |
+-------+------------+------------+
| 8 | 78.78% | 77.96% |
+-------+------------+------------+
| 16 | 98.19% | 79.61% |
+-------+------------+------------+
| 64 | 111.56% | 72.60% |
+-------+------------+------------+
| 256 | 113.80% | 69.96% |
+-------+------------+------------+
| 1024 | 114.42% | 70.85% |
+-------+------------+------------+
S32_D565_Opaque_Dither:
=======================
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -4.18% | -0.93% |
+-------+------------+------------+
| 2 | -2.43% | -2.04% |
+-------+------------+------------+
| 4 | -1.09% | -1.23% |
+-------+------------+------------+
| 8 | 184.89% | 136.53% |
+-------+------------+------------+
| 16 | 128.64% | 89.11% |
+-------+------------+------------+
| 64 | 132.68% | 100.98% |
+-------+------------+------------+
| 256 | 157.02% | 100.86% |
+-------+------------+------------+
| 1024 | 163.85% | 103.62% |
+-------+------------+------------+
S32_D565_Blend_Dither:
======================
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -4.87% | 0.01% |
+-------+------------+------------+
| 2 | -2.71% | 2.97% |
+-------+------------+------------+
| 4 | -2.20% | 0.28% |
+-------+------------+------------+
| 8 | 149.76% | 146.80% |
+-------+------------+------------+
| 16 | 85.69% | 95.77% |
+-------+------------+------------+
| 64 | 88.81% | 101.39% |
+-------+------------+------------+
| 256 | 97.32% | 107.22% |
+-------+------------+------------+
| 1024 | 98.08% | 115.71% |
+-------+------------+------------+
S32A_D565_Opaque_Dither:
========================
+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
| 1 | -1.86% | 0.02% |
+-------+------------+------------+
| 2 | -0.58% | -1.52% |
+-------+------------+------------+
| 4 | -0.75% | 1.16% |
+-------+------------+------------+
| 8 | 240.74% | 155.16% |
+-------+------------+------------+
| 16 | 181.97% | 132.15% |
+-------+------------+------------+
| 64 | 203.11% | 136.48% |
+-------+------------+------------+
| 256 | 223.45% | 133.05% |
+-------+------------+------------+
| 1024 | 225.96% | 134.05% |
+-------+------------+------------+
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
BUG=skia:
R=djsollen@google.com , mtklein@google.com
Author: kevin.petit@arm.com
Review URL: https://codereview.chromium.org/317193003
2014-06-06 08:45:36 -07:00
bsalomon
93c2fb02f1
Rebaselines for drrect GM on GPU
...
TBR=
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/318773007
2014-06-05 07:56:56 -07:00
Brian Salomon
c7671bec73
Rebase a few GMs and remove some tests from ignored-tests.txt
...
Review URL: https://codereview.chromium.org/311813003
2014-06-03 10:01:47 -04:00