Skip to content

Commit

Permalink
disable DAA
Browse files Browse the repository at this point in the history
** Sheriffs, this is a bug fix that affects most curve drawing. **
** I've got thousands of diffs here, and probably missed a few. **
** If we could find a way to roll forward through any breakages **
** rather than revert this CL, I'd be very appreciative.  It's  **
** going on a month now trying to get this in.                  **

DAA and its ilk have fundamental problems dealing with overlapping
coverage.  While we think about how to solve them (and if they can
be solved at all), turn it off.

It took me a while to find one,
but fast/borders/borderRadiusDashed01.html is the smoking gun.

Bug: chromium:913223, skia:6886
Change-Id: I42b6b1cec464a40017ee4e8e4f9c663bb13a11e6
Reviewed-on: https://chromium-review.googlesource.com/c/1412462
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Cr-Commit-Position: refs/heads/master@{#628388}
  • Loading branch information
Mike Klein authored and Commit Bot committed Feb 1, 2019
1 parent 6332ec9 commit 4a34a70
Show file tree
Hide file tree
Showing 1,713 changed files with 19 additions and 12 deletions.
13 changes: 10 additions & 3 deletions content/test/gpu/gpu_tests/pixel_expectations.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ def SetExpectations(self):

# Software compositing is not supported on Android: we skip the tests that
# disable GPU compositing (--disable-gpu-compositing).
self.Skip('Pixel_OffscreenCanvasUnaccelerated2D', ['android'])
self.Skip('Pixel_OffscreenCanvasUnaccelerated2DWorker', ['android'])
self.Skip('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing', ['android'])
# TODO(mtklein): restore these next three after rebaselining
#self.Skip('Pixel_OffscreenCanvasUnaccelerated2D', ['android'])
#self.Skip('Pixel_OffscreenCanvasUnaccelerated2DWorker', ['android'])
#self.Skip('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing',
# ['android'])
self.Skip('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
['android'])
self.Skip('Pixel_OffscreenCanvasWebGLSoftwareCompositing', ['android'])
Expand Down Expand Up @@ -145,3 +147,8 @@ def SetExpectations(self):
self.Fail('Pixel_Video_MP4_FourColors_Rot_90', ['android'], bug=925744)
self.Fail('Pixel_Video_VP9', ['android'], bug=925744)
self.Fail('Pixel_Video_Context_Loss_VP9', ['android'], bug=925744)

# TODO(mtklein): need a rebaseline for crrev.com/c/1412462
self.Fail('Pixel_OffscreenCanvasUnaccelerated2D', bug=913223)
self.Fail('Pixel_OffscreenCanvasUnaccelerated2DWorker', bug=913223)
self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing', bug=913223)
6 changes: 3 additions & 3 deletions content/test/gpu/gpu_tests/pixel_test_pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -868,21 +868,21 @@ def ExperimentalCanvasFeaturesPages(base_name):
'pixel_offscreenCanvas_2d_commit_main.html',
base_name + '_OffscreenCanvasUnaccelerated2D',
test_rect=[0, 0, 360, 200],
revision=8,
revision=9,
browser_args=browser_args + unaccelerated_args),

PixelTestPage(
'pixel_offscreenCanvas_2d_commit_worker.html',
base_name + '_OffscreenCanvasUnaccelerated2DWorker',
test_rect=[0, 0, 360, 200],
revision=8,
revision=9,
browser_args=browser_args + unaccelerated_args),

PixelTestPage(
'pixel_offscreenCanvas_2d_commit_main.html',
base_name + '_OffscreenCanvasUnaccelerated2DGPUCompositing',
test_rect=[0, 0, 360, 200],
revision=13,
revision=14,
browser_args=browser_args + ['--disable-accelerated-2d-canvas']),

PixelTestPage(
Expand Down
6 changes: 6 additions & 0 deletions skia/config/SkUserConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,

#define SK_LEGACY_SRGB_STAGE_CHOICE

// We're turning this off indefinitely,
// until we can figure out some fundamental problems with its approach.
//
// See chromium:913223, skia:6886.
#define SK_DISABLE_DAA

///////////////////////// Imported from BUILD.gn and skia_common.gypi

/* In some places Skia can use static initializers for global initialization,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"drawsContent": false,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [800, 600],
"drawsContent": false
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"drawsContent": false,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [800, 600],
"drawsContent": false
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"drawsContent": false,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"bounds": [800, 600],
"drawsContent": false
},
{
Expand Down
Loading

0 comments on commit 4a34a70

Please sign in to comment.