diff options
| author |  mtklein <mtklein@chromium.org> | 2015-04-03 08:27:37 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-03 08:27:37 -0700 |
| commit | ac813d8a1212bf31c75a564a57fe5240edb84019 (patch) | |
| tree | 11cbfa02a0bc3e77631d3d228840dfdcf312c306 | |
| parent | 80bd3ae9d76bcb9bdbf28c978c64134cdd503385 (diff) | |
Try ARMv7 and NEON for Daisy.
I think Daisy's color order problems are in non-NEON ARM assembly.
NEON might actually be fine.
BUG=skia:1843
Committed: https://skia.googlesource.com/skia/+/a121c0ee6b911dd7004c6054a8692d37084b6b3d
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android_Neon-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot,Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot
Review URL: https://codereview.chromium.org/1054233002
| -rw-r--r-- | gyp/libpng.gyp | 12 | ||||
| -rwxr-xr-x | platform_tools/chromeos/bin/chromeos_setup.sh | 3 |
2 files changed, 4 insertions, 11 deletions
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp index 1ca6eef253..73bdd2aa3c 100644 --- a/gyp/libpng.gyp +++ b/gyp/libpng.gyp @@ -36,15 +36,9 @@ '-w', '-fvisibility=hidden', ], - 'conditions': [ - ['not arm_neon', { - 'defines': [ - # FIXME: Why is this needed? Without it, pngpriv.h sets it - # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON - # not be defined since arm_neon is 0? - 'PNG_ARM_NEON_OPT=0', - ], - }], + 'defines': [ + # TODO: it'd be nice to enable PNG's NEON when possible. + 'PNG_ARM_NEON_OPT=0', ], 'sources': [ '../third_party/externals/libpng/png.c', diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh index de4d6f99ca..b04eb1b310 100755 --- a/platform_tools/chromeos/bin/chromeos_setup.sh +++ b/platform_tools/chromeos/bin/chromeos_setup.sh @@ -34,8 +34,7 @@ setup_device() { GENERIC_BOARD_TYPE="amd64-generic" ;; daisy) - # TODO(mtklein): make this arm_version=7 arm_neon=1 - DEFINES="${DEFINES} skia_arch_type=arm" + DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=1" # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm # build, which throws lots of "mangling of va_list has changed" warnings. DEFINES="${DEFINES} skia_warnings_as_errors=0" |