diff options
| author | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 22:30:03 +0000 |
|---|---|---|
| committer | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 22:30:03 +0000 |
| commit | a8e7f25ac79d0b47dad724926f05bf8d97fc1440 (patch) | |
| tree | 5cadd84fc2d496baf3c6f811aeecf621f797bbca /webkit | |
| parent | 1787bb4ffda4373742250cdd539ef30d35dcb27f (diff) | |
| download | chromium_src-a8e7f25ac79d0b47dad724926f05bf8d97fc1440.zip chromium_src-a8e7f25ac79d0b47dad724926f05bf8d97fc1440.tar.gz chromium_src-a8e7f25ac79d0b47dad724926f05bf8d97fc1440.tar.bz2 | |
Add a shallow command buffer flush that doesn't glFlush
BUG=131661
TEST=gpu_unittests now checks for the GL_CHROMIUM_shallow_flush string.
Review URL: https://chromiumcodereview.appspot.com/10782005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
3 files changed, 8 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 06ad53f..b6b67a8 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -1641,5 +1641,7 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, WebGLId, WGC3Dint, const WGC3Dchar*) +DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM) + } // namespace gpu } // namespace webkit diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 67376af..eb31f88 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -481,6 +481,8 @@ class WebGraphicsContext3DInProcessCommandBufferImpl virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location, const WGC3Dchar* uniform); + virtual void shallowFlushCHROMIUM(); + protected: virtual GrGLInterface* onCreateGrGLInterface(); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index 1be900e..293dd05 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -478,6 +478,10 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location, const WGC3Dchar* uniform); + // CHROMIUM_shallow_flush + // Only applies to contexts that use the command buffer. + virtual void shallowFlushCHROMIUM() { } + protected: virtual GrGLInterface* onCreateGrGLInterface(); |