diff options
author | sievers@google.com <sievers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 23:02:55 +0000 |
---|---|---|
committer | sievers@google.com <sievers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 23:02:55 +0000 |
commit | 7bffe9e1e36489115a3ae4577b2e4f1a1253374b (patch) | |
tree | 54f66fd51a598e3b94f430b77e9cc22eff48ead2 /gpu/command_buffer/client/gles2_implementation.cc | |
parent | dc6938a6f60389c30d4db00077627e1a31517e0b (diff) | |
download | chromium_src-7bffe9e1e36489115a3ae4577b2e4f1a1253374b.zip chromium_src-7bffe9e1e36489115a3ae4577b2e4f1a1253374b.tar.gz chromium_src-7bffe9e1e36489115a3ae4577b2e4f1a1253374b.tar.bz2 |
[gpu] Remove StreamTexture(Manager) concept from command decoder
Instead add a simple GpuControl interface to attach a GLImage-wrapped
SurfaceTexture ref to a texture which will provide the
necessary hooks.
BUG=282700,309162
R=palmer@chromium.org, piman@chromium.org, reveman@chromium.org
Review URL: https://codereview.chromium.org/147463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/client/gles2_implementation.cc')
-rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 93aa3d63..0133311 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -3207,29 +3207,8 @@ GLuint GLES2Implementation::CreateStreamTextureCHROMIUM(GLuint texture) { GPU_CLIENT_LOG("[" << GetLogPrefix() << "] CreateStreamTextureCHROMIUM(" << texture << ")"); TRACE_EVENT0("gpu", "GLES2::CreateStreamTextureCHROMIUM"); - typedef cmds::CreateStreamTextureCHROMIUM::Result Result; - Result* result = GetResultAs<Result*>(); - if (!result) { - return GL_ZERO; - } - *result = GL_ZERO; - - helper_->CreateStreamTextureCHROMIUM(texture, - GetResultShmId(), - GetResultShmOffset()); - WaitForCmd(); - GLuint result_value = *result; - CheckGLError(); - return result_value; -} - -void GLES2Implementation::DestroyStreamTextureCHROMIUM(GLuint texture) { - GPU_CLIENT_SINGLE_THREAD_CHECK(); - GPU_CLIENT_LOG("[" << GetLogPrefix() << "] DestroyStreamTextureCHROMIUM(" - << texture << ")"); - TRACE_EVENT0("gpu", "GLES2::DestroyStreamTextureCHROMIUM"); - helper_->DestroyStreamTextureCHROMIUM(texture); - CheckGLError(); + helper_->CommandBufferHelper::Flush(); + return gpu_control_->CreateStreamTexture(texture); } void GLES2Implementation::PostSubBufferCHROMIUM( |