Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: gyp/common_conditions.gypi

Issue 302783002: Initial work to get ETC1 data up to the GPU (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add #define to not always compile in ETC1 support Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gm/etc1bitmap.cpp ('k') | gyp/gpu.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 'SK_SUPPORT_ETC1'
9 ], 10 ],
10 'conditions' : [ 11 'conditions' : [
11 [ 'skia_arch_type == "arm64"', { 12 [ 'skia_arch_type == "arm64"', {
12 'cflags': [ 13 'cflags': [
13 '-ffp-contract=off', 14 '-ffp-contract=off',
14 ], 15 ],
15 }], 16 }],
16 17
17 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). 18 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac).
18 [ 'skia_arch_type == "x86"', { 19 [ 'skia_arch_type == "x86"', {
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 'SK_BUILD_JSON_WRITER', 655 'SK_BUILD_JSON_WRITER',
655 ] 656 ]
656 }], 657 }],
657 658
658 ], # end 'conditions' 659 ], # end 'conditions'
659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
660 'xcode_settings': { 661 'xcode_settings': {
661 'SYMROOT': '<(DEPTH)/xcodebuild', 662 'SYMROOT': '<(DEPTH)/xcodebuild',
662 }, 663 },
663 } 664 }
OLDNEW
« no previous file with comments | « gm/etc1bitmap.cpp ('k') | gyp/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698