diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 19:58:09 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 19:58:09 +0000 |
| commit | ebd286c9b8830a393aeceeea303335cf8440db6a (patch) | |
| tree | 9330ce28fe88db9da45c6d08a76c1720db5d68be | |
| parent | 189f514bdfbdbf837529ba9fc92cefa5825001f8 (diff) | |
| download | chromium_src-ebd286c9b8830a393aeceeea303335cf8440db6a.zip chromium_src-ebd286c9b8830a393aeceeea303335cf8440db6a.tar.gz chromium_src-ebd286c9b8830a393aeceeea303335cf8440db6a.tar.bz2 | |
roll to pickup batching of rect draws
Review URL: http://codereview.chromium.org/6538020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75301 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 1 insertions, 6 deletions
@@ -11,7 +11,7 @@ vars = { "libjingle_revision": "50", "libvpx_revision": "65287", "ffmpeg_revision": "74917", - "skia_revision": "797", + "skia_revision": "808", "v8_revision": "6812", } diff --git a/skia/skia.gyp b/skia/skia.gyp index f524d6e..75b922e 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -21,7 +21,6 @@ '../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', @@ -667,8 +666,6 @@ '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', @@ -783,8 +780,6 @@ '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', ], }, }, |