Roll Skia to f459c85457c

skia/skia_library_opts.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # This gyp file contains the platform-specific optimizations for Skia
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
@@ skipping 17 matching lines @@
       'target_name': 'skia_opts',
       'type': 'static_library',
       'includes': [
         'skia_common.gypi',
       ],
       'include_dirs': [
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
         '../third_party/skia/src/core',
         '../third_party/skia/src/opts',
+        '../third_party/skia/src/utils',
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and \
            target_arch != "arm" and target_arch != "arm64" and \
            target_arch != "mipsel"', {
           'cflags': [
             '-msse2',
           ],
         }],
         [ 'target_arch != "arm" and target_arch != "mipsel" and \
            target_arch != "arm64"', {
           'sources': [
+            '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
           ],
           'dependencies': [
             'skia_opts_ssse3',
             'skia_opts_sse4',
           ],
         }],
         [ 'target_arch == "arm"', {
           'conditions': [
             [ 'arm_version >= 7 and arm_neon == 1', {
               'defines': [
@@ skipping 25 matching lines @@
           'cflags!': [
             '-fno-omit-frame-pointer',
             '-marm',
             '-mapcs-frame',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
           ],
         }],
         [ 'target_arch == "arm" and (arm_version < 7 or (arm_neon == 0 and arm_neon_optional == 1))', {
           'sources': [
             '../third_party/skia/src/opts/memset.arm.S',
           ],
         }],
         [ 'target_arch == "arm" and arm_version < 6', {

[krajcevski, 2014/07/14 18:52:57]

Does one of these need either the "neon" or the "none" targets?

[mtklein, 2014/07/14 18:58:16]

Not sure.  I had the _arm.cpp unconditionally in both of these (in both files),
but I've switched (both files) to use _arm.cpp for ARM v7+ and _none.cpp for ARM
v6-.  Seems like it's what we do for most optimizations.

           'sources': [
             '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
         [ 'target_arch == "arm" and arm_version >= 6', {
           'sources': [
             '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
             '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
           ],
         }],
         [ 'target_arch == "mipsel"',{
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
+            '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
         [ 'target_arch == "arm64"', {
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
           ],
         }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
@@ skipping 86 matching lines @@
       ],
       'include_dirs': [
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
         '../third_party/skia/src/core',
       ],
       'sources': [
         '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
         '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
         '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
+        '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
+        '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+        '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
         '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
         '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
-        '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
-        '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
       ],
     },
   ],
   'conditions': [
     # NEON code must be compiled with -mfpu=neon which also affects scalar
     # code. To support dynamic NEON code paths, we need to build all
     # NEON-specific sources in a separate static library. The situation
     # is very similar to the SSSE3 one.
     ['target_arch == "arm" and (arm_neon == 1 or arm_neon_optional == 1)', {
       'targets': [
@@ skipping 17 matching lines @@
           ],
           'cflags': [
             '-mfpu=neon',
             '-fomit-frame-pointer',
           ],
           'ldflags': [
             '-march=armv7-a',
             '-Wl,--fix-cortex-a8',
           ],
           'sources': [
-            '../third_party/skia/src/opts/memset16_neon.S',
-            '../third_party/skia/src/opts/memset32_neon.S',
             '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h',
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
             '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp',
+            '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
+            '../third_party/skia/src/opts/memset16_neon.S',
+            '../third_party/skia/src/opts/memset32_neon.S',
           ],
           'conditions': [
             ['arm_neon == 1', {
               'defines': [
                 '__ARM_HAVE_NEON',
               ],
             }],
             ['arm_neon_optional == 1', {
               'defines': [
                 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }