summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 00:59:35 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 00:59:35 +0000
commita80773bb263a9706cc8ee4e3f336d2d3d28fadd8 (patch)
tree2a7bb4449491520be9b3f85dbdd9978c06a902ac /content
parent6c7dcb2f278335c8ae8bbfd8ef3b440d5329bfa7 (diff)
downloadchromium_src-a80773bb263a9706cc8ee4e3f336d2d3d28fadd8.zip
chromium_src-a80773bb263a9706cc8ee4e3f336d2d3d28fadd8.tar.gz
chromium_src-a80773bb263a9706cc8ee4e3f336d2d3d28fadd8.tar.bz2
The semantics of shallow finish are to block until the GPU process has issued all prior GL commands, without necessarily waiting for the GPU to complete them. It might have better performance than a regular finish in some cases. It is also less likely to hang if the GPU hangs on some platforms, such as Windows.
Review URL: https://chromiumcodereview.appspot.com/17504006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc3
-rw-r--r--content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
index 1e8bf8a..3a78079 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
@@ -1520,7 +1520,8 @@ DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum,
DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
WebGLId, WGC3Dint, const WGC3Dchar*)
-DELEGATE_TO_GL(shallowFlushCHROMIUM,ShallowFlushCHROMIUM);
+DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM);
+DELEGATE_TO_GL(shallowFinishCHROMIUM, ShallowFinishCHROMIUM);
DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint)
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
index bba922d..e1bbc07 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
@@ -563,6 +563,7 @@ class WebGraphicsContext3DCommandBufferImpl
const WGC3Dchar* uniform);
virtual void shallowFlushCHROMIUM();
+ virtual void shallowFinishCHROMIUM();
virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox);
virtual void produceTextureCHROMIUM(WGC3Denum target,