diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 21:31:50 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 21:31:50 +0000 |
| commit | 0e11c771b440ec92ac7a913333657767eb0a65cb (patch) | |
| tree | 63e48bc2ea20690ccac487010e1f587545757b28 /skia/skia.gyp | |
| parent | b11f26239fb03ebb19bdbb0b60ae68c75eea82d8 (diff) | |
| download | chromium_src-0e11c771b440ec92ac7a913333657767eb0a65cb.zip chromium_src-0e11c771b440ec92ac7a913333657767eb0a65cb.tar.gz chromium_src-0e11c771b440ec92ac7a913333657767eb0a65cb.tar.bz2 | |
Roll skia to 788.
Modify skia.gyp to account for new/removed files.
Copy defines from direct_dependent defines to regular defines (where they should have been all along).
Mirror of http://codereview.chromium.org/6519015/
Review URL: http://codereview.chromium.org/6515018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 2c974db..b35beac 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -11,6 +11,8 @@ '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', @@ -34,7 +36,6 @@ '../third_party/skia/gpu/src/GrTextContext.cpp', '../third_party/skia/gpu/src/GrTextStrike.cpp', '../third_party/skia/gpu/src/GrTextStrike_impl.h', - '../third_party/skia/gpu/src/GrVertexBufferAllocPool.cpp', '../third_party/skia/gpu/include/GrAllocPool.h', '../third_party/skia/gpu/include/GrAllocator.h', @@ -47,6 +48,7 @@ '../third_party/skia/gpu/include/GrContext_impl.h', '../third_party/skia/gpu/include/GrDrawTarget.h', '../third_party/skia/gpu/include/GrFontScaler.h', + '../third_party/skia/gpu/include/GrGeometryBuffer.h', '../third_party/skia/gpu/include/GrGLConfig.h', '../third_party/skia/gpu/include/GrGLConfig_chrome.h', '../third_party/skia/gpu/include/GrGLIndexBuffer.h', @@ -89,7 +91,6 @@ '../third_party/skia/gpu/include/GrTypes.h', '../third_party/skia/gpu/include/GrUserConfig.h', '../third_party/skia/gpu/include/GrVertexBuffer.h', - '../third_party/skia/gpu/include/GrVertexBufferAllocPool.h', #'../third_party/skia/src/animator/SkAnimate.h', #'../third_party/skia/src/animator/SkAnimateActive.cpp', @@ -664,6 +665,8 @@ '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!': [ |