roll to pickup batching of rect draws

skia/skia.gyp

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(library)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
       'sources': [
         '../third_party/skia/gpu/src/GrAllocPool.cpp',
         '../third_party/skia/gpu/src/GrAtlas.cpp',
         '../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
         '../third_party/skia/gpu/src/GrBufferAllocPool.h',
         '../third_party/skia/gpu/src/GrClip.cpp',
         '../third_party/skia/gpu/src/GrContext.cpp',
         '../third_party/skia/gpu/src/GrDrawTarget.cpp',
         '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
         '../third_party/skia/gpu/src/GrGLTexture.cpp',
         '../third_party/skia/gpu/src/GrGLUtil.cpp',
         '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
         '../third_party/skia/gpu/src/GrGpu.cpp',
-        '../third_party/skia/gpu/src/GrGpuGLShaders.cpp',
         '../third_party/skia/gpu/src/GrGpuGLShaders.h',
         '../third_party/skia/gpu/src/GrGpuFactory.cpp',
         '../third_party/skia/gpu/src/GrGpuGL.cpp',
         '../third_party/skia/gpu/src/GrGpuGL.h',
         '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
         '../third_party/skia/gpu/src/GrMatrix.cpp',
         '../third_party/skia/gpu/src/GrMemory.cpp',
         '../third_party/skia/gpu/src/GrPath.cpp',
         '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
         '../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
@@ skipping 625 matching lines @@
         '../gpu',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'mac_framework_dirs': [
         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
       ],
       'defines': [
         'SK_BUILD_NO_IMAGE_ENCODE',
         'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
-        'GR_STATIC_RECT_VB=1',
-        'GR_SKIP_2POINTRADIAL_PROGRAMS',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
       ],
       'conditions': [
         [ 'OS != "mac"', {
           'sources/': [
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/'] ],
         }],
@@ skipping 94 matching lines @@
           '../third_party/skia/gpu/include',
           'ext',
         ],
         'mac_framework_dirs': [
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
         'defines': [
           'SK_BUILD_NO_IMAGE_ENCODE',
           'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
           'GR_AGGRESSIVE_SHADER_OPTS=1',
-          'GR_STATIC_RECT_VB=1',
-          'GR_SKIP_2POINTRADIAL_PROGRAMS',
         ],
       },
     },
 
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
@@ skipping 76 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: