Commit ebd286c9 authored by reed@google.com's avatar reed@google.com

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
parent 189f514b
...@@ -11,7 +11,7 @@ vars = { ...@@ -11,7 +11,7 @@ vars = {
"libjingle_revision": "50", "libjingle_revision": "50",
"libvpx_revision": "65287", "libvpx_revision": "65287",
"ffmpeg_revision": "74917", "ffmpeg_revision": "74917",
"skia_revision": "797", "skia_revision": "808",
"v8_revision": "6812", "v8_revision": "6812",
} }
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
'../third_party/skia/gpu/src/GrGLUtil.cpp', '../third_party/skia/gpu/src/GrGLUtil.cpp',
'../third_party/skia/gpu/src/GrGLVertexBuffer.cpp', '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
'../third_party/skia/gpu/src/GrGpu.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/GrGpuGLShaders.h',
'../third_party/skia/gpu/src/GrGpuFactory.cpp', '../third_party/skia/gpu/src/GrGpuFactory.cpp',
'../third_party/skia/gpu/src/GrGpuGL.cpp', '../third_party/skia/gpu/src/GrGpuGL.cpp',
...@@ -667,8 +666,6 @@ ...@@ -667,8 +666,6 @@
'SK_BUILD_NO_IMAGE_ENCODE', 'SK_BUILD_NO_IMAGE_ENCODE',
'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
'GR_AGGRESSIVE_SHADER_OPTS=1', 'GR_AGGRESSIVE_SHADER_OPTS=1',
'GR_STATIC_RECT_VB=1',
'GR_SKIP_2POINTRADIAL_PROGRAMS',
], ],
'sources!': [ 'sources!': [
'../third_party/skia/include/core/SkTypes.h', '../third_party/skia/include/core/SkTypes.h',
...@@ -783,8 +780,6 @@ ...@@ -783,8 +780,6 @@
'SK_BUILD_NO_IMAGE_ENCODE', 'SK_BUILD_NO_IMAGE_ENCODE',
'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
'GR_AGGRESSIVE_SHADER_OPTS=1', 'GR_AGGRESSIVE_SHADER_OPTS=1',
'GR_STATIC_RECT_VB=1',
'GR_SKIP_2POINTRADIAL_PROGRAMS',
], ],
}, },
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment